Rings reworked
Rectangles filld too now