bunch of DI stuff for CBS

will move to BCL Content when the last run is done