Finished DataManager. Now ready to merge.