Refactoring USF import.  Not fully tested at this point - but works.