Final version of app

Everything currently working and tested