Finish demo app for reals