DRAFT - version

This version was sended to the prof and the buddy for a first feedback