final update before challenge, keeping code in history for reference should I get stuck.