Uky merge2a

Redo of PR 20, reset to an earlier state.
Do these lines do anything important, and if so, do they need to be uncommented back in?