WIP: new signals, broken!