passthru almost working
passthrough refactor