Modify app

Full functionality!