Prep for "Final" refactor.