Assessment 1 - my solution