Add in input stuff from TA code