Finished up exercise 21