some refactoring and initial work on introduction