More fleshing out the AST