Cleaning up, adding data storage for three years