Export working

First functional commit