Back to 1.6 and using the 107 types as based types

A huge commit... what a mess. And from my master on top of that...