I love killing code -- begin refactoring import stage to use adapters