Don't stress about making it reusable outside of fleet. That's not a goal of this refactor. We're explicitly moving away from reusing existing code.