Saving everything, this commit should make the app run at 80% at least