initial subgrid support.
sub grids appear to be working. Not sure about sorting just yet.
Merge branch 'master' into gh-pages