Started adding in variables