add content, rearrange, note on topics/db/optimization
reconcile merge conflict