Fixed Unresolved Symnbols
Moved subsystem out of command base