Latest commit of my various hacks - look at how I can feed these back