Prep for refactor into class.