First attempt at simplifying grid.
Moar savings!
Updating grid tests
Merge remote-tracking branch 'origin/Grid-Rewrite' into v2