New features: add rectangles & ellipses.