Grid working
Merge pull request #6 from katherinea/moving

Grid working
merged grids etc
fixed grid