Refactoring Signal Terminal - WIP