Spec + code quasi finis

Reste tests ….