Assignment 2 Final Update (hopefully)