After a bit of refactoring, grid is feeling pretty solid