Some more work. To hell with atomicity.