Automaton branch merge

Merging things and such.