Lots more stuff

*messing with shapes
*getting stuff to move