Component rearangement to address bugs #8 and #6. Prep work for bugs #3 and #5..

See individual commits for details.