First iteration on task 2