Committing Basic Shapes V1.1

Wow, I've come a LONG way since this. :)