in progress on AST: grabbing new stuff
fixing dumb conflicts