removed extraneous TODO
formatting
more formatting
more formatting
changed syntax to support inside-out macro expansion