Updated AST, started work on simplifying and evaluation