Finished More functionality on the app