finished adding rectangle stuff