Challenge 6 partially solved