Fixed IOC issue and added ElasticSearch support.  Need to work on IOC to finished