Merge in Dan's pages to work with grid