bloat clarify
First cut at being much cleverer with locking