Data manager 2

got all the changes i needed, so time to put it back into the master fork.