God dammit yes :P

Maybe I should just have one long pull request where I put all my stuff to avoid this? :D