Finish demo app, take three