Added ability to draw squares and triangles.