Splitting the shell and watch commands further