Issue for tracking the next phase of this work.