moved rhc to subsystem, begin support for switched systems