Adds basic functionality and tests
Merge pull request #1 from jgoley/jonathan

Adds basic functionality and tests