Moved drawing logic into the shape