intermediate commit once again, but intend to finish this tonight on another computer, so wil have to push, unfortunately