Refactor tokumx

Ok we've used that before so there is no way back...