Ongoing work on improved solution.