Update with Chad's latest, clean up trees, needs vendor updates