Add ability to draw circles and rectangles