Replicator support

The previous Replicator support commit didn't grab and move Replicators properly.