Initial migration to Kina codename, tests passing