major merge to finish what we are going to do in terms of mindless conversion; we will now turn to getting code snippets from testable py files