I think if you remove this and make it it's own PR and get feedback I'll accept the PR :)