Almost completed subsystems, a few bugs remain