Working on 2.12

But not done yet.