Almost completely refactored RectangleSystems