Rewriting signal module. WIP