refactored how shapes are drawn
fixed unit tests
cleanup