Please do not look on this commit it's nothing fun to see here :)