Csv to organization rebased

I decided to merge Dave's in because it looked good and then rebased this on top of it