first commit from assignment 2