more testing.  attendant refactorings.