Normalized database and added some to-dos