P1 in progress

This is the final commit for assignment P1 (hopefully).