switch to my vendor

Also take some stuff from BGP so i don't need to fork everything