* add function and tests to specifically determine @all & @channel * uodate per comments - regex and tests