Upgraded App to full class (and other stuff)