Create functions in prep for refactor