(docset) WIP added comments and DB stuff