challenge 7 first iteration
bug fixes