Initial controlled version of the demo app