diff --git a/Shapes.py b/Shapes.py
new file mode 100644
index 0000000..0618be7
--- /dev/null
+++ b/Shapes.py
@@ -0,0 +1,372 @@
+"""
+Contains the classes.
+
+* Shapes
+* Shape
+* Point
+* Line
+* Grid
+
+Shapes (replaces ShapeHistory) keeps track of objects dervied from Shape.
+"""
+import copy
+
+from functools import reduce
+
+import queue_model_objects_v1 as queue_model_objects
+
+from HardwareRepository.BaseHardwareObjects import HardwareObject
+from HardwareRepository.HardwareRepository import dispatcher
+
+
+class Shapes(HardwareObject):
+    """Keeps track of Shapes."""
+
+    def __init__(self, name):
+        HardwareObject.__init__(self, name)
+        self.shapes = {}
+
+    def get_shapes(self):
+        """
+        Get all Shapes.
+
+        :returns: All the shapes
+        :rtype: Shape
+        """
+        return self.shapes.values()
+
+    def get_points(self):
+        """
+        Get all Points currently handled.
+
+        :returns: All points currently handled
+        :rtype: Point
+        """
+        current_points = []
+
+        for shape in self.get_shapes():
+            if isinstance(shape, Point):
+                current_points.append(shape)
+
+        return current_points
+
+    def get_lines(self):
+        """
+        Get all Lines currently handled.
+
+        :returns: All lines currently handled
+        :rtype: Line
+        """
+        current_points = []
+
+        for shape in self.get_shapes():
+            if isinstance(shape, Line):
+                current_points.append(shape)
+
+        return current_points
+
+    def get_grids(self):
+        """
+        Get all Grids currently handled.
+
+        :returns: All Grids currently handled
+        :rtype: Grid
+        """
+        current_points = []
+
+        for shape in self.get_shapes():
+            if isinstance(shape, Grid):
+                current_points.append(shape)
+
+        return current_points
+
+    def get_shape(self, sid):
+        """
+        Get Shape with id <sid>.
+
+        :param str sid: id of Shape to retrieve
+        :returns: Shape assocaited with sid
+        :rtype: sid
+        """
+        return self.shapes.get(sid, None)
+
+    def add_shape(self, shape):
+        """
+        Add the shape <shape> to the dictionary of handled shapes.
+
+        :param shape: Shape to add.
+        :type shape: Shape object.
+        """
+        self.shapes[shape.id] = shape
+
+    def add_shape_from_mpos(self, mpos_list, screen_coord, t):
+        """
+        Adds a shape of type <t>, with motor positions from mpos_list and
+        screen position screen_coord.
+
+        :param list mpos_list: List of motor positions
+        :param tuple screen_coord: Screen cordinate for shape
+        :param str t: Type str for shape, P (Point), L (Line), G (Grid)
+        :returns: Shape of type <t>
+        :rtype: <t>
+        """
+        cls_dict = {"P": Point, "L": Line, "G": Grid}
+        _cls = cls_dict[t]
+        shape = None
+
+        if _cls:
+            shape = _cls(mpos_list, screen_coord)
+            self.add_shape(shape)
+
+        return shape
+
+    def add_shape_from_refs(self, refs, t):
+        """
+        Adds a shape of type <t>, taking motor positions and screen positions
+        from reference points in refs.
+
+        :param list refs: List of id's of the refrence Points
+        :param str t: Type str for shape, P (Point), L (Line), G (Grid)
+        :returns: Shape of type <t>
+        :rtype: <t>
+        """
+        mpos = [self.get_shape(refid).mpos() for refid in refs]
+        spos_list = [self.get_shape(refid).screen_coord for refid in refs]
+        spos = reduce((lambda x, y: x + y), spos_list, ())
+        shape = self.add_shape_from_mpos(mpos, spos, t)
+        shape.refs = refs
+
+        return shape
+
+    def delete_shape(self, sid):
+        """
+        Removes the shape <shape> from the list of handled shapes.
+
+        :param shape: The shape to remove
+        :type shape: Shape object.
+        """
+        return self.shapes.pop(sid, None)
+
+    def clear_all(self):
+        """
+        Clear the shapes, remove all contents.
+        """
+        self.shapes = {}
+
+    def get_selected_shapes(self):
+        """
+        Get all selected shapes.
+
+        :returns: List fot selected Shapes
+        :rtype: List of Shapes
+        """
+        return [s for s in self.shapes.values() if s.is_selected()]
+
+    def de_select_all(self):
+        """De select all shapes."""
+
+        for shape in self.shapes.values():
+            shape.de_select()
+
+    def select_shape(self, sid):
+        """
+        Select the shape <shape> (programmatically).
+
+        :param shape: The shape to select.
+        :type shape: Shape
+        """
+        shape = self.shapes.get(sid, None)
+
+        if shape:
+            shape.select()
+
+    def de_select_shape(self, sid):
+        """
+        De-select the shape <shape> (programmatically).
+
+        :param shape: The shape to de-select.
+        :type shape: Shape
+        """
+        shape = self.shapes.get(sid, None)
+
+        if shape:
+            shape.de_select()
+
+    def is_selected(self, sid):
+        """
+        Check if Shape with <sid> is selected.
+
+        :returns: True if Shape with <sid> is selected False otherwise
+        :rtype: Shape
+        """
+        shape = self.shapes.get(sid, None)
+        return shape and shape.is_selected()
+
+    # Signature maintained for backward compatability with ShapeHistory.
+    # Not yet implemented
+    def get_snapshot(self, *args, **kwargs):
+        """
+        Get a snapshot of the video stream and overlay the objects in
+        qub_objects.
+
+        :returns: The snapshot
+        :rtype: str
+        """
+        pass
+
+    def select_shape_with_cpos(self, cpos):
+        return
+
+    def get_grid(self):
+        pass
+
+    def set_grid_data(self, key, result_data):
+        pass
+
+
+class Shape(object):
+    """
+    Base class for shapes.
+    """
+    SHAPE_COUNT = 0
+
+    def __init__(self, mpos_list=[], screen_coord=(-1, -1)):
+        object.__init__(self)
+        Shape.SHAPE_COUNT += 1
+        self.t = "S"
+        self.id = ""
+        self.cp_list = []
+        self.name = ""
+        self.state = "SAVED"
+        self.screen_coord = screen_coord
+        self.selected = False
+        self.refs = []
+
+        self.add_cp_from_mp(mpos_list)
+
+    def get_centred_positions(self):
+        """
+        :returns: The centred position(s) associated with the shape.
+        :rtype: List of CentredPosition objects.
+        """
+        return self.cpos_list
+
+    def select(self):
+        self.selected = True
+
+    def un_select(self):
+        self.selected = False
+
+    def update_position(self, transform):
+        spos_list = [transform(cp.as_dict()) for cp in self.cp_list]
+        self.screen_coord = reduce((lambda x, y: x + y), spos_list, ())
+
+    def add_cp_from_mp(self, mpos_list):
+        for mp in mpos_list:
+            self.cp_list.append(queue_model_objects.CentredPosition(mp))
+
+    def set_id(self, id_num):
+        self.id = self.t + "%s" % id_num
+        self.name = self.id
+
+    def update_from_dict(self, shape_dict):
+        # We dont allow id updates
+        shape_dict.pop("id", None)
+
+        for key, value in shape_dict.iteritems():
+            if hasattr(self, key):
+                setattr(self, key, value)
+
+    def as_dict(self):
+        cpos_list = []
+
+        for cpos in self.cp_list:
+            cpos_list.append(cpos.as_dict())
+
+        d = copy.deepcopy(vars(self))
+
+        # replace cpos_list with a list of motor positions
+        d.pop("cp_list")
+        d["motor_positions"] = str(cpos_list)
+
+        return d
+
+
+class Point(Shape):
+    SHAPE_COUNT = 0
+
+    def __init__(self, mpos_list, screen_coord):
+        Shape.__init__(self, mpos_list, screen_coord)
+        Point.SHAPE_COUNT += 1
+        self.t = "P"
+        self.set_id(Point.SHAPE_COUNT)
+
+    def get_centred_position(self):
+        return self.cp_list[0]
+
+    def mpos(self):
+        return self.cp_list[0].as_dict()
+
+    def set_id(self, id_num):
+        Shape.set_id(self, id_num)
+        self.cp_list[0].index = self.id
+
+    def as_dict(self):
+        d = Shape.as_dict(self)
+        # replace cpos_list with the motor positions
+        d["motor_positions"] = self.cp_list[0].as_dict()
+        return d
+
+
+class Line(Shape):
+    SHAPE_COUNT = 0
+
+    def __init__(self, mpos_list, screen_coord):
+        Shape.__init__(self, mpos_list, screen_coord)
+        Line.SHAPE_COUNT += 1
+        self.t = "L"
+        self.set_id(Line.SHAPE_COUNT)
+
+    def get_centred_positions(self):
+        return [self.start_cpos, self.end_cpos]
+
+    def get_points_index(self):
+        if all(self.cp_list):
+            return (self.cp_list[0].get_index(), self.cp_list[1].get_index())
+
+
+class Grid(Shape):
+    SHAPE_COUNT = 0
+
+    def __init__(self, mpos_list, screen_coord):
+        Shape.__init__(self, mpos_list, screen_coord)
+        Grid.SHAPE_COUNT += 1
+        self.t = "G"
+        self.set_id(Grid.SHAPE_COUNT)
+
+        self.top = -1
+        self.left = -1
+        self.width = -1
+        self.height = -1
+        self.cell_count_fun = "zig-zag"
+        self.cell_h_space = -1
+        self.cell_height = -1
+        self.cell_v_space = -1
+        self.cell_width = -1
+        self.label = "Grid"
+        self.num_cols = -1
+        self.num_rows = -1
+        self.selected = False
+
+    def get_centred_position(self):
+        return self.cp_list[0]
+
+    def set_id(self, id_num):
+        Shape.set_id(self, id_num)
+        self.cp_list[0].index = self.id
+
+    def as_dict(self):
+        d = Shape.as_dict(self)
+        # replace cpos_list with the motor positions
+        d["motor_positions"] = self.cp_list[0].as_dict()
+        return d