Testing for autopop

Also minor name changes to make csv parser work again
Revert "Testing for autopop"

This reverts commit aa2c316be6aed4170fb7dadd487d9137206b355d.
Merge remote-tracking branch 'origin/Caroline' into Caroline