Added shapes class. Shapes now stay on screen. Cleaned up code.