cleaned up code, changed parsing of csv, about to change templating