Starting to Remove Hard Coded Vars