WIP added csv stuff