Taking my cpp and h file into Otani's test
May be incompatible with master branch.

Review diffs before merging.
Add, toString and Convert working.
Successfully ran all tests against Otani's tester