experimental macro support

What does this change entail?