Moved more shell functionality to the ShellCommand class