Assignment 4 more progress