Fleshed out the app a lot more