Standardize variable names, need to move increment logic to model.