Fixed bugs and tested.  Functional.