Took a lot of the suggestions into account, and I'm about half way through, but the sprint is ending :-(