It will still be nice to move this new functions to a new utils file and refactor more code on later PRs.