Revamp app

blah