Develop

I want to push this through now to get the Sheiko fix in there and I don't want to cherry pick.

Should be able to deploy tonight. Needs a bit of testing first.