Giving up on full solution.  Using Athena's combined approach.