Grid updates

This works well with the tables and relationships I added. I should get
those into the repo