broken checkout, mid run / configurable refactor