Added remainder of RefactorU exercise 2