WIP: adding context to macros
WIP: adding fold_mac field to fold.rs