lots of changes
clusterfuck
alright, merge didn't seem to blow anything up...time to move on.