got export to work on __init__
Fixed merge conflicts in __init__