Got rid of clunky Grid class & Cell class