Objects work now
Merge branch 'Shapes'