Made lots of progress on app