^ move plugin init code into bootstrap
^ update factory