Start on new AST representation