added inputs, need to think of ones i do/don't need