Whoops it looks like I did fail to merge

Should be correctly merged now... hopefully.