incremental changes; prepping for refactor