Finally shipped the refactor nobody asked for! Only took 3x the estimate
This is the motivation I needed