Assignment 2, commit 1