I was just moving around existing code, but I could do it (let's say I'll do it if there are other changes I need to push :))