Lots of additions, parse tree almost stable