Refactor to pass stderr through