Added most of the import functionality. Needs bugs squashed now