WIP: Get working on Spree 1.3