Initial push of Assignment 2