Automaton macro now works. Moving on to a couple bug fixes.