Completed Assignment 2 file