Finish development of demo app