More progress now just need correct export