Moved somethings to databags (added tests for them)

continued solidifying the interactions