Added much needed Rectangle classes