Feature/shop

Pull request for comparison and build check of Shop feature., Not ready for merge yet.