Initial use of grids in grid
Merge master with dev-vincent