Initial work on demo 2.