Renaming variable, more commits to follow to pull variables out and up into command-line arguments