Changed the importing code to a class, instead of a series of functions. Some associated changes.
Merge remote-tracking branch 'origin/develop' into develop