Continuing work on app