More progress on the shell.