[COMPLETE REHAUL]
Checkout Fixes