Challenge 7 is working, still need to fine tune