towards full re-engineering.

Damn it's hard !!!!