Assignment 2 nearly complete