Finish demo app (really this time)