working on the app