I'm running a fork at the moment so I'd like to get this merged in, does someone want to make a call on which implementation should be used?