china (bug 922252)
WIP
* Add tests
* Tweak UI to be more clear