First draft.
Merge branch 'master' of https://github.com/frankzhewang/MerchandiseTest-StatusQuo