Still working on test suite and testing. Lots of bugs. Wading through the
link class at the moment. Need to clean up some of the validation code.