Uky merge2a

Redo of PR 20, reset to an earlier state.