Additional work on the grid demo.