Refactoring of signal-sending done, tests incomplete