Finished More functionality on the app 2.0