getting ready to refactor