Feature/thankshop