Merging assignment 3 and 4