Hmm yeah, you're right. I'll tweak it some more and make another commit. This was still a bit WIP but sg wanted the updated version for something he's doing, hence the pull!