Changed Var Names and Added to Validation

Does not work ATM.