More stuff working, but need to re-work branch AST structure- should only have relevant things visible, but also be expressive.