I made a few changes for the demo.  Hiding stuff that's not done, etc.