Add rectangle function
Add ellipse and square