less story-war specific, WIP
whew, big cleanup & it's working