More refactoring.  Pulling things out the GridScene and putting them
into the Grid class