Export functionality work in progress, need to fix the button for export as it is ugly!!!!
Merge remote-tracking branch 'origin/master'