Changes to support vars and the !deck command

For some reason I can't do a regular git-push so I'm submitting this pull request instead.