Most of developement

Lots of development done outside Git (shame on me).