Assignment 6 almost done