Refactored adaptor to clean up code.  Not fully executing just yet.  Almost done.