Added import support. Small bug fixes.
Moved to util.
Progress, porting to new format.