systemComponent check bug fix.
Fleshed out master list generation.