more refactoring - just the shell control scripts