Dev v3

This is the final step befor merging in master.
Chair CESEC is not functional but wil not be after the V2.1