First commit of the alpha testing for Nicolas Sakoff