Improve import/export for split (still not passing)

Need to merge this in with the one provided in the auto_publish branch.