Major upgrade (Format branch)

Hi,
what do you think about this kind of upgrade? (please read commit comments).
Best regards