More testing madness.  Starting to get somewhere.  This is going to be fun to refactor.