1.x->2.x migration fully integrated, tests passing.