Get initial marco expansion working