Basic data managment
Merged data-retention. Closes #29