Whip up some macros for easier generated code
Generator macros phase one complete