Start updating functions to do passthrough