fix(rebase): readd socketFactoryFactory
fix(rebase): yay all of our stuff