Lots of changes to app to make more sense