Further changes from refactoring.  Debugging.  All files now use consistent naming for methods.