Adds Gu You and Cham

Branched off from #11 (so please merge it before this one)

Fixes #9