Code and unit tests complete

Code and unit tests complete

Code reorganization and cleanup

Also an additional unit test.

Add additional methods and tests

This release includes additional methods.

Fix add method

Fixes an issue reported concerning the add method adding to itself.