Mutation fixes

Still WIP, getting it in so folks can see.