part 1 and part 2
Merge github.com:changti/t-chang-rottenpotatoes