adding the changes made so far
solved a merge problem(?) and added RectangleSpec
fixing a bug introduced while merging