Working demo.  Also cleaned up the DB