challenge6 solved! Tests needed.