Continued work on RectangleTool