Significantly better run than my first submission, but still a long way to go.