Prep for refactor demo