Replacing grid (lines) with cell objects; refactoring