Finish first version of demo app