Started a massive rewrite of the story.  Hope marco likes it.