NF - handle multiple grids

Also includes a test suite.
Merge pull request #2 from ajdawson/multi-grid

NF - handle multiple grids