Worked on the DataClass and its tests....almost done