Just a small reminder that this needs to be removed before I can merge this. I'd like to base my work on top of this branch so it would be great if you could get to this sooner rather than later. Thanks. Ben