Finish demo app, not much staff done yet