Started work on more automated AST generation