some changes to datamanager; should be good to work on now