Modify FlatFile storage to be more abstract; press on with data storage in general
Update code to latest version