More fiddling about so things still work
More fiddling about so setup.py works