Add tool to create the DB
Update TODO