Merged grid

Incorporates #19
Resolved merge conflicts