Final commit for demo app