added a bunch of shapes, did a bunch of work