Get app working like tutorial version