Uploaded db. Updated TODO,
Solved merge conflicts.