Did my homework, task 1 and 2