-- first steps in refactoring shell to new architecture