Rewriting everything, saving current state in case that was a bad idea