wip: in the green!
wip: even closer
refactor: less macroexpanded code, simplify marker management