WIP - refactoring with grid changes