OK, I don't see anything awfully wrong with this, I'm sure hydra will disagree, but this will be merged for now.