It'd be great if we could use dependency injection for this instead of a static factory