Final version for today

Formation of dictionaries should be correct, must process data now.