Merging in the mastership implementation