Filled out two functions in file