Backup before we break anything

Working commit with all the minor tweaks we forgot