Refactored Signaller and reactive-transport