stuff I probably redid on the other computer
merge conflict