diff --git a/scripts/pygcode-crop b/scripts/pygcode-crop
new file mode 100755
index 0000000..a5f79fc
--- /dev/null
+++ b/scripts/pygcode-crop
@@ -0,0 +1,193 @@
+#!/usr/bin/env python
+
+# Script to remove commands of a gcode file before and after the given range.
+# All gcodes before the given line will be replaced with equivalent rapid
+# movements to get to the right position. Initial rapid movement will first move
+# to the maximum Z value used in the removed portion, then move to XY,
+# then move down to the correct Z.
+
+import argparse
+import re
+from copy import copy
+
+for pygcode_lib_type in ('installed_lib', 'relative_lib'):
+    try:
+        # pygcode
+        from pygcode import Machine, Mode
+        from pygcode import Line
+
+    except ImportError:
+        import sys, os, inspect
+        # Add pygcode (relative to this test-path) to the system path
+        _this_path = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+        sys.path.insert(0, os.path.join(_this_path, '..', 'src'))
+        if pygcode_lib_type == 'installed_lib':
+            continue # import was attempted before sys.path addition. retry import
+        raise # otherwise the raised ImportError is a genuine problem
+    break
+
+
+# =================== Command Line Arguments ===================
+# --- Types
+def range_type(value):
+    """
+    Return (is_first, is_last) such that is_first(n, pos) will return True if
+    the gcode's current line is the first to be cropped, and similarly for the
+    last line.
+    :param value: string given as argument
+    :return: (is_first, is_last) callables
+    """
+    # All files are cropped from one line, to another, identifying these lines is
+    # done via the [first] and [last] cropping criteria.
+    #   - Line numbers (parameters: n)
+    #   - Machine position (parameters: x,y,z,a,b,c,u,v,w)
+    # Comparisons, all with <letter><comparison><number>
+    #   - = (or ==) equal to
+    #   - != not equal to
+    #   - < less than
+    #   - <= less than or equal to
+    #   - > greater than
+    #   - >= greater than or equal to
+    match = re.search(r'^(?P<first>[^:]*):(?P<last>[^:]*)$', value)
+    if not match:
+        raise argparse.ArgumentTypeError("'%s' range invalid format" % value)
+
+    def _cmp(cmp_str):
+        """
+        Convert strings like
+            'x>10.3'
+        into a callable equivalent to:
+            lambda n, pos: pos.X > 10.3
+        where:
+            n is the file's line number
+            pos is the machine's position (Position) instance
+        :param cmp_str: comparison string of the form: '<param><cmp><value>'
+        :return: callable
+        """
+        CMP_MAP = {
+            '=': lambda a, b: a == b,
+            '==': lambda a, b: a == b,
+            '!=': lambda a, b: a != b,
+            '<': lambda a, b: a < b,
+            '<=': lambda a, b: a <= b,
+            '>': lambda a, b: a > b,
+            '>=': lambda a, b: a >= b,
+        }
+        # split comparison into (param, cmp, value)
+        m = re.search(
+            r'''^\s*
+                (
+                    (?P<param>[abcnuvwxyz])?\s*  # parameter
+                    (?P<cmp>(==?|!=|<=?|>=?))   # comparison
+                )?\s* # parameter & comparison defaults to "n="
+                (?P<value>-?\d+(\.\d+)?)\s*
+            $''',
+            cmp_str, re.IGNORECASE | re.MULTILINE | re.VERBOSE
+        )
+        if not m:
+            raise argparse.ArgumentTypeError("'%s' range comparison invalid" % cmp_str)
+        (param, cmp, val) = (
+            (m.group('param') or 'N').upper(),  # default to 'N'
+            m.group('cmp') or '=',  # default to '='
+            m.group('value')
+        )
+
+        # convert to lambda
+        if param == 'N':
+            if float(val) % 1:
+                raise argparse.ArgumentTypeError("'%s' line number must be an integer" % cmp_str)
+            return lambda n, pos: CMP_MAP[cmp](n, float(val))
+        else:
+            return lambda n, pos: CMP_MAP[cmp](getattr(pos, param), float(val))
+
+    def _cmp_group(group_str, default):
+        """
+        Split given group_str by ',' and return callable that will return True
+        only if all comparisons are true.
+        So if group_str is:
+            x>=10.4,z>1
+        return will be a callable equivalent to:
+            lambda n, pos: (pos.X >= 10.4) and (pos.Z > 1)
+        (see _cmp for more detail)
+        :param group_str: string of _cmp valid strings delimited by ','s
+        :param default: default callable if group_str is falsey
+        :return: callable that returns True if all cmp's are true
+        """
+        if not group_str:
+            return default
+        cmp_list = []
+        for cmp_str in group_str.split(','):
+            cmp_list.append(_cmp(cmp_str))
+        return lambda n, pos: all(x(n, pos) for x in cmp_list)
+
+
+    is_first = _cmp_group(match.group('first'), lambda n, pos: True)
+    is_last = _cmp_group(match.group('last'), lambda n, pos: False)
+
+    return (is_first, is_last)
+
+
+# --- Defaults
+
+
+# --- Create Parser
+parser = argparse.ArgumentParser(description='Crop a gcode file down to the')
+parser.add_argument(
+    'infile', type=argparse.FileType('r'), nargs=1,
+    help="gcode file to normalize",
+)
+parser.add_argument(
+    'range', type=range_type,
+    help="file range to crop, format [first]:[last]",
+)
+
+
+# --- Parse Arguments
+args = parser.parse_args()
+
+
+# =================== Cropping File ===================
+
+# --- Machine
+class NullMachine(Machine):
+    MODE_CLASS = type('NullMode', (Mode,), {'default_mode': ''})
+
+machine = NullMachine()
+
+pre_crop = True
+post_crop = False
+
+(is_first, is_last) = args.range
+
+
+for (i, line_str) in enumerate(args.infile.readlines()):
+    line = Line(line_str)
+
+    # TODO: remember machine's maximum values for each axis
+    # TODO: based on machine.abs_pos
+
+    # remember machine's (relevant) state before processing
+    # TODO: create machine.__copy__ to copy position & state
+    old_machine = copy(machine)
+    machine.process_block(line.block)
+
+    if pre_crop:
+        if is_first(i + 1, old_machine.pos):
+            # First line inside cropping range
+            pre_crop = False
+
+            # TODO: print mode
+            print(old_machine.mode)
+            # TODO: position machine before first cropped line
+            # TODO: rapid move to Z (maximum Z)
+            # TODO: rapid move to X,Y
+            # TODO: rapid move to Z (machine.pos.Z)
+
+
+    if (pre_crop, post_crop) == (False, False):
+
+        print(line)
+
+        if is_last(i + 1, old_machine.pos):
+            # Last line in cropping range
+            post_crop = True
diff --git a/src/pygcode.egg-info/PKG-INFO b/src/pygcode.egg-info/PKG-INFO
index c5d6f57..1b92725 100644
--- a/src/pygcode.egg-info/PKG-INFO
+++ b/src/pygcode.egg-info/PKG-INFO
@@ -119,15 +119,13 @@ Description: =======
             G01 X1 Y2 F100 S1000 ; blah
             >>> print(line.block)
             G01 X1 Y2 F100 S1000
+            >>> sorted(line.block.gcodes)
+            [<GCodeFeedRate: F100>,
+             <GCodeSpindleSpeed: S1000>,
+             <GCodeLinearMove: G01{X1, Y2}>]
             >>> print(line.comment)
             ; blah
         
-            >>> line = Line('G0 x1 y2 (foo) f100 (bar) s1000')
-            >>> print(line)
-            G00 X1 Y2 F100 S1000 (foo. bar)
-            >>> print(line.comment)
-            (foo. bar)
-        
         
         Interpreting what a line of gcode does depends on the machine it's running on,
         and also that machine's state (or 'mode')