Tuple fix

Allow all variables to be passed in properly, derp