Completing exercise 21
Started exercise 22