WIP - using a grid system
WIP - refactoring with grid changes
grid system in place
merging in grid system