Added the Cell class. Replaced the two nested lists of map with a single list of cells.