Begin creating library and tests for #5
#5 modify class structure and test
Merge branch 'issue-5'
Closes issue #5