Re-write grid debugging
Merge pull request #242 from ericam/debug

Re-write grid debugging