Dictionary almost finished