I've started to write task #6

Pending unit test and the other methods of this class