Almost final version

@fergunet fixed what you said, check whatever you want until Friday afternoon