Most of challenge 7 completed