wip/ap2-macro
