WIP: take it to the AST