Req#001 done and tested

Req #001 is ok after tests