Subclassed all Shape objects to Shape class