Atomic problems too

Pretty confident this ought to nail charge-cloning.