I'm leaving a note suggesting the refactor.