work against issue #46. Almost done all left is editing.