Updated Imports

Made the importer methods to be static so they no longer need remade
each time.
Merge remote-tracking branch 'origin/master' into Alex---Fix