Refactoring some more.  API nearly complete.  Still working on getting the thing actually working.