a bunch of commits; dun remeber what; I just don't want to lose it