Made a ton of changes to the app