break work functions out of import handler
Merge commit 'eef4' into culttag-redux