More changes. Moved Rectangle creation into the cell itself.