WIP 4375 initial draft

WIP 4375 - Parameterized Macro Tags