Some identation and a very early version of the MacroDriver