Edata dictionary building WIP 1
Edata Dictionary building WIP2