Feature/cbl incremental store

Maybe this will have more comment ability...