prepping for refactoring