Uky merge2a

Redo of PR 20, reset to an earlier state.
Is there a purpose to this commented out code that we might want to keep in another file?  If not, please remove.