first commit, not working
bug fixes, seemd to load ES now