Caught up to end of hw3