Refactored all shape objects to prototype off a single class