Add vars
Make tests pass
Merge pull request #7 from arobinson109/jb/fixes

Fixes