Given we already have 3 different calls to find or create an OS, it seemed easier to add this at the end. I'm open to a larger refactor of this method, but that felt out of scope here.