Finished implementation of methods and test.  Need to debug.