Grids refactored, closes #17
Merge fix