App is pretty much done ish