Added proper import command based on which type of DB used.
Tightened up some code and progress implementation.