Closes #1 - tests for current functionality passing, new passing still WIP with failing tests
Merge pull request #19 from evillemez/tests

Closes #1 - tests for current features passing