Added Square, I should consider using rectangle as a base