First version readable + added dictionaries