updates to grids; ready for testing