If this works, it's probably the first big merge in my life that runs well the first time :)