It'd be really nice to keep these in separate commits/PRs ;)