Minor refactor of Rectangle.
First attempt at filling colour - bit ugly.