Adding until, after, and inbetween output commands
Adding @t macro to throw in a TRACE line