first commit to refactoring branch. everything will be broken until it isn't, and then we merge back to main
