Challenge 1 solved, quick and dirty