Issue: this commit is ridiculous. Let's do more atomic stuff. Unfortunately this was pretty rapid work.