Finish demo app - baby steps