Making the Case for a Checkout Refactor