I agree now that I think about it. This will have to be changed across the whole project then, so maybe easier to do it all at once after this has been merged.