refactor
slightly simpler macro logic
bold macro
first parse at serializing to HTML