Assignment 2

Updated to have better comments