Adding es dicts
Adding files and tests for it

A bit of changing here and there.
Too many files

Never use git add *