Simplifying Checkout

Work in progress