Task 3.1 90% coded