Second homework, almost done