SRectangle refactor -- needs intersect fix