signal mapper needs work