Continuing work on data
Fixed pull commit conflicts