Task 3 done

Test will be added later