Update code in main repo

Realized should probably do a long overdue PR to update the code in the shopify repo.