HW6 mostly done