Adam/generalized draft import export 2

@dmitchell -- is this the right idea?