Big fat update

No changelog because this will not be included in the PR HONK