Continued work on the state of the app.