Assignment 2

Filled in the two functions