Prep for Statement Refactor