Almost ready to switch to new shell.