DB test
Expand TODO
Some renaming
Design for index file format