Unicode work

Should be ready for release candidate testing.