Demo done

...except for bug that I may have to look at some day.