:+1: on all this, will be done in a second step ;)