Task 2 done

Tests and docs will be added later