Reorg database/
Add basic stats