Move more functionality into DecodeSignal