Vendors -work in progress-
Merged last akullmer commit