WIP re vendorize
Kinda works yo