wip macro engine changes