Merge pull request #11 from kalimar/master

You said, "I believe she's ready captain"
Square up the deck post WK additions