I think I've already changed it so it is in my other branch. This isn't something that should be changed now though (right?) as it's a big api change?