Finish demo app by Greggy