Added circle, triangle, and cruciform to simulator.