continuing the process of changing TSS from being a separate process into being embedded within Bifrost