User GUI factory edits underway - saving until tomorrow; am half way
there to getting it to work
Merge remote-tracking branch 'origin/master'