Filling the database correctly now.