Optimizations of import process, went from about a 16 second test run to a 6 second test run