Very basic first pass at macros
Much cleaner macros service