New Entry according to data

Changes to csv output - removed all HIV stuff for now