Getting a few more things ready for the app