Completed the first two portions of the assignment