Stopgap commit
fixing some strange AST issues, back to working order