Refactored subsystems, made final subsystems