Added some more code and got some unit test work done.