Challenge... completed (and even on the same day). Now to refactor ideally.