Scrap that, I'll close this PR and update with a new one as I think I've missed something anyway