Second commit of Assignment 1