I really like the condensing of everything into the single Grid class. Nice refactoring!