Made important changes in no-logging branch that I infuriatingly can't move elsewhere.

Don't even want to talk about it.