Removed obsolete squares2
Changeing test_shape to work with new drawing code
Fixed indentation which was a mix of 4 and 2 spaces
Updated to use new way of drawing
Added in transforms, ids, rectangles and grids
Now makes a generator both for squares and example, but uses the example
one to start with