Changed grid class to be array of cells, removed IDs from cells
Fixed bugs in new grid class
Review changes and ready to merge