added some database goodness (flat-file-db) as well as deprecating some more things