week2, almost done