Last update before attempting to remove pexpect (in preparation for a windows build)