Changed data structure a little
Added export as csv