more subsystem work
Merge remote-tracking branch 'upstream/master'
Merge pull request #206 from patriot1burke/master

more subsystem work