World class rebase

Rebased to latest upstream. This includes manual entry mode as well as other World Class changes. Should be easier to pull in.