A lot of work on trees and generation. Vanilla base is pretty much done.