Little work on making the data manager useage easier and a little progress