some work on the app