we can, and should, refactor this in another PR