Factor out shapes into separate module
Add ShapeCollection.add_table()