2nd try at getting assignment 2 right