I know this probably doesn't belong in this PR, but it has been thoroughly discussed and I don't think anyone will mind :)