added draw.square and draw.rectangle