refactoring progress
ES and file loading is working