Massive overhaul towards making macros work. YEAH BABY!