Switched to templated Rect struct