Added and tested Rect and Circle shapes
Updated all classes to be new-style classes