Fix app
Add a lot of stuff