I think I might bring Willis more central to the story...

...thoughts?