My windows python environment is broken, so I will have to work on my
laptop.  Commit is merely to move files over