Assignment 6a almost done