First commit on the ASTBuilder branch