Demo runs, now on to fixing bugs in all the layers.