Uky merge2a

Redo of PR 20, reset to an earlier state.
What are these lines for?  If it's for object setup that doesn't need to be run every time, please create a commit that moves it to a separate file.

If it's not needed, create a commit that removes them.