Added Polygon and Square but would like to consolidate some classes