Finished grid data structure refactor