making it a Subsystem might be the right approach