Fixed the stubs in the code and made sure the tests passed.  Also finished the Javadoc for the file.