No idea what's going in this commit, it's old and I don't remember what I've done here =). Compiles and all anyway, so =).