Refactored all shapes
Getting there with shapes