Moved shop model functions around