Added dictionaries and random function
fixed merge conflict