Another portion of duplex refactor
More segregations and refactorings of the duplex workflow