Final demo app commit