Almost finished
Fix db