Finish daves demo app