Pull in Sue's replication WIP
wip