Restored custom grid, and lots of testing stuff