*UNTESTED* adding of toggle messages and macro creation