Slowly working on redoing checkout./