Export functionality work in progress