Completed javadocs and most of Unit test clean up to work off new static methods instead of old class specific implementations.