diff --git a/aws_cis_elasticsearch/README.md b/aws_cis_elasticsearch/README.md
new file mode 100644
index 0000000..5198191
--- /dev/null
+++ b/aws_cis_elasticsearch/README.md
@@ -0,0 +1,32 @@
+# aws-cis-elasticsearch
+This is a lambda function that exports AWS CIS Benchmark results to Elasticsearch
+
+Suports AWS Elasticsearch, and standard Elasticsearch.
+
+The following environment variables can be set to your liking:
+
+es_url:
+The http/s url of the elasticsearch cluster
+es_index:
+The elasticsearch index name that will be created. This can be a time formatted string so that you can automatically create time based indexes, eg, aws-cis-metrics-%Y-%m-%d will be evaluated to aws-cis-metrics-2017-11-09, something that kibana can discover. See this for more information on the time formatting:
+http://strftime.org/
+
+es_authmethod:
+one of "iam", "http", by default it will use "iam" and attempt to connect via EC2 IAM roles, http will using standard http auth (basic), and anything else will not attempt to use any authentication at all.
+
+es_username: 
+HTTP auth username (if using es_authmethod "http")
+
+es_password:
+HTTP auth password (if using es_authmethod "http")
+
+es_encvar:
+if set, will try to unecrypt environment variables set by the "in-transit" lambda encryption and KMS.
+The the following parameters support this:
+es_user
+es_password
+If it does decrypt the values, it will report this in the logs (but not display the actual values).
+
+
+To build lambda python zip package:
+./build-lambda-env-python3.6.sh && ./package-lambda.sh
diff --git a/aws_cis_elasticsearch/aws_cis_elasticsearch.py b/aws_cis_elasticsearch/aws_cis_elasticsearch.py
new file mode 100755
index 0000000..720c007
--- /dev/null
+++ b/aws_cis_elasticsearch/aws_cis_elasticsearch.py
@@ -0,0 +1,170 @@
+#!/usr/bin/python3
+#from jsonpath_rw import jsonpath, parse
+from __future__ import print_function
+
+import sys
+import os
+import json
+import urllib
+import boto3
+import re
+
+print('Loading function')
+
+s3 = boto3.client('s3')
+
+
+from collections import OrderedDict
+from jsonpath_ng import jsonpath, parse
+
+import datetime
+
+# Our imports
+from elasticsearch import Elasticsearch, ElasticsearchException, RequestsHttpConnection
+from requests_aws4auth import AWS4Auth
+
+
+# default index to use
+ES_INDEX = "aws-cis-metrics-%Y-%m-%d"
+ES_URL = None
+ES_USERNAME=None
+ES_PASSWORD=None
+# can be one of iam, http or none
+ES_AUTHMETHOD="iam"
+
+tsnow = datetime.datetime.utcnow()
+
+
+def processreport(contents, accountId):
+    global ES_AUTHMETHOD
+
+    print("processing report")
+
+    myfilejson=json.loads(contents)
+
+    jsonpath_expr = parse('"*"."*"')
+
+    convjson=[(str(match.path), match.value) for match in jsonpath_expr.find(myfilejson)]
+
+    
+    ES_AUTHMETHOD = os.environ.get("es_authmethod", ES_AUTHMETHOD)
+
+    try:
+       
+        if ES_AUTHMETHOD=="iam": 
+            connection_class=RequestsHttpConnection
+            awsauth = AWS4Auth(os.environ.get("AWS_ACCESS_KEY_ID", None), os.environ.get("AWS_SECRET_ACCESS_KEY", None), os.environ.get("AWS_REGION", None), 'es', session_token=os.environ.get("AWS_SESSION_TOKEN", None))
+            es = Elasticsearch(hosts=[ES_URL], verify_certs=True, use_ssl=True, ca_certs='/etc/ssl/certs/ca-bundle.crt', http_auth=awsauth, connection_class=RequestsHttpConnection)
+        # send http auth if user is specified
+        elif ES_AUTHMETHOD=="http":
+           if ES_USERNAME:
+               es = Elasticsearch(hosts=[ES_URL], verify_certs=True, use_ssl=True, ca_certs='/etc/ssl/certs/ca-bundle.crt', http_auth=(ES_USERNAME, ES_PASSWORD))
+           else:
+               es = Elasticsearch(hosts=[ES_URL], verify_certs=True, use_ssl=True, ca_certs='/etc/ssl/certs/ca-bundle.crt')
+        else:
+           es = Elasticsearch(hosts=[ES_URL], verify_certs=True, use_ssl=True, ca_certs='/etc/ssl/certs/ca-bundle.crt')
+            
+        today = datetime.datetime.today()
+        myesindex=today.strftime(ES_INDEX)
+        print('Creating es index: '+myesindex)
+        es.indices.create(index=myesindex,
+            ignore=[400],
+            body={'mappings':{'aws-cis-metric':
+            {'properties':
+            {'@timestamp':{'type':'date'},
+            'ControlId':{'type':'string'},
+            'AccountId': {'type':'string'},
+            'ScoredControl':{'type':'boolean'},
+            'Offenders': {'type':'array'},
+            'failReason': {'type':'string'},
+            'Description': {'type':'string'},
+            'Result': {'type': 'boolean'},
+            }
+            }
+            }})
+    except ElasticsearchException as error:
+        sys.stderr.write("Can't connect to Elasticsearch server %s: %s, continuing.\n" % (ES_URL, str(error)))
+        exit(1)
+
+# Assemble all metrics into a single document
+# Use @-prefixed keys for metadata not coming in from PCP metrics
+    es_doc = OrderedDict({'@timestamp': today})
+
+    try:
+        for t,v in convjson:
+            d=OrderedDict()
+            for v1 in v.items():
+                d[v1[0]] = v1[1]
+                d['AccountId']=accountId
+
+# pylint: disable=unexpected-keyword-arg
+            es.index(index=myesindex,
+                    doc_type='aws-cis-metric',
+                    timestamp=tsnow,
+                    body=OrderedDict(list(es_doc.items())+list(d.items())))
+    except ElasticsearchException as error:
+        sys.stderr.write("Can't send to Elasticsearch server %s: %s, continuing.\n" % (ES_URL, str(error)))
+        exit(1)
+
+
+def lambda_handler(event, context):
+    global ES_URL
+    global ES_INDEX
+    global ES_USERNAME
+    global ES_PASSWORD
+    global ES_AUTHMETHOD
+    print("invoked lambda handler")
+
+    b64pattern = re.compile("^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})$")
+    from base64 import b64decode
+
+    ES_URL=os.environ.get("es_url", None)
+    ES_INDEX=os.environ.get("es_index", ES_INDEX)
+    ES_USERNAME = os.environ.get("es_username", None)
+    ES_PASSWORD = os.environ.get("es_password", None)
+    ES_ENCVAR = os.environ.get("es_encenvvar", None)
+
+    if ES_URL:
+        print("Using es server: " + ES_URL)
+    else:
+        print("Failed to obtain ES_URL, please set environment variables")
+        exit(1)
+    if ES_INDEX :
+        print("Using es index: " + ES_INDEX)
+
+
+    # Decrypt code should run once and variables stored outside of the function
+    # handler so that these are decrypted once per container
+    if ES_USERNAME and ES_ENCENVVAR:
+        if b64pattern.match(ES_USERNAME):
+            print("Decryting es_username")
+            ES_USERNAME= boto3.client('kms').decrypt(CiphertextBlob=b64decode(ES_USERNAME))['Plaintext']
+
+    if ES_PASSWORD and ES_ENCENVVAR:
+        if b64pattern.match(ES_PASSWORD):
+            print("Decryting es_password")
+            ES_PASSWORD= boto3.client('kms').decrypt(CiphertextBlob=b64decode(ES_PASSWORD))['Plaintext']
+
+    # Get the object from the event and show its content type
+    bucket = event['Records'][0]['s3']['bucket']['name']
+    key = urllib.parse.unquote(event['Records'][0]['s3']['object']['key'])
+    try:
+        response = s3.get_object(Bucket=bucket, Key=key)
+        #print("CONTENT TYPE: " + response['ContentType']+"\n")
+        print("KEY: " + key+"\n")
+        matchObj = re.match('cis_report_([0-9]+)_.*\.json', key, flags=0)
+        if matchObj:
+            accountId=matchObj.group(1)
+            print("Received report for " + key + " Account: "+accountId)
+        else:
+            print("KEY: " + key + " does not look like a report file, ignoring")
+
+        contents = response['Body'].read()
+        processreport(contents, accountId) 
+        print("finished processing report")
+        return "Processed report " + key
+    except Exception as e:
+        print(e)
+        print('Error getting object {} from bucket {}. Make sure they exist and your bucket is in the same region as this function.'.format(key, bucket))
+        raise e
+
diff --git a/aws_cis_elasticsearch/build-lambda-env-python3.6.sh b/aws_cis_elasticsearch/build-lambda-env-python3.6.sh
new file mode 100755
index 0000000..b2ffe53
--- /dev/null
+++ b/aws_cis_elasticsearch/build-lambda-env-python3.6.sh
@@ -0,0 +1,47 @@
+# A virtualenv running Python3.6 on Amazon Linux/EC2 (approximately) simulates the Python 3.6 Docker container used by Lambda
+# and can be used for developing/testing Python 3.6 Lambda functions
+# This script installs Python 3.6 on an EC2 instance running Amazon Linux and creates a virtualenv running this version of Python
+# This is required because Amazon Linux does not come with Python 3.6 pre-installed
+# and several packages available in Amazon Linux are not available in the Lambda Python 3.6 runtime
+# The script has been tested successfully on a t2.micro EC2 instance (Root device type: ebs; Virtualization type: hvm)
+# running Amazon Linux AMI 2017.03.0 (HVM), SSD Volume Type - ami-c58c1dd3
+# and was developed with the help of AWS Support
+# The steps in this script are:
+# - install pre-reqs
+# - install Python 3.6
+# - create virtualenv
+# install pre-requisites
+
+PYTHONENV="aws-cis-elasticsearch-python36-env"
+
+sudo yum -y groupinstall development
+sudo yum -y install zlib-devel
+sudo yum -y install openssl-devel
+# Installing openssl-devel alone seems to result in SSL errors in pip (see https://medium.com/@moreless/pip-complains-there-is-no-ssl-support-in-python-edbdce548
+
+# Need to install OpenSSL also to avoid these errors
+wget https://github.com/openssl/openssl/archive/OpenSSL_1_0_2l.tar.gz
+tar -zxvf OpenSSL_1_0_2l.tar.gz
+cd openssl-OpenSSL_1_0_2l/
+./config shared
+make
+sudo make install
+export LD_LIBRARY_PATH=/usr/local/ssl/lib/
+cd ..
+rm OpenSSL_1_0_2l.tar.gz
+rm -rf openssl-OpenSSL_1_0_2l/
+# Install Python 3.6
+wget https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz
+tar xJf Python-3.6.0.tar.xz
+cd Python-3.6.0
+./configure
+make
+sudo make install
+cd ..
+rm Python-3.6.0.tar.xz
+sudo rm -rf Python-3.6.0
+# Create virtualenv running Python 3.6
+sudo pip install --upgrade virtualenv
+virtualenv -p python3 $PYTHONENV
+source $PYTHONENV/bin/activate
+
diff --git a/aws_cis_elasticsearch/deps.txt b/aws_cis_elasticsearch/deps.txt
new file mode 100644
index 0000000..383e981
--- /dev/null
+++ b/aws_cis_elasticsearch/deps.txt
@@ -0,0 +1,4 @@
+elasticsearch
+requests_aws4auth
+jsonpath_ng
+
diff --git a/aws_cis_elasticsearch/package-lambda.sh b/aws_cis_elasticsearch/package-lambda.sh
new file mode 100755
index 0000000..f2f4e86
--- /dev/null
+++ b/aws_cis_elasticsearch/package-lambda.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+PYTHONENV="aws-cis-elasticsearch-python36-env"
+PACKAGENAME="aws_cis_elasticsearch-`date +%Y%m%d`.zip"
+source $PYTHONENV/bin/activate
+TMPDIR=`mktemp -d`
+cp aws_cis_elasticsearch.py aws-cis-elasticsearch-python36-env
+for i in `cat deps.txt`; do
+	python -m pip install $i -t $TMPDIR/
+done
+
+
+cp aws_cis_elasticsearch.py $TMPDIR
+( cd $TMPDIR && zip -r $PACKAGENAME * )
+mv $TMPDIR/$PACKAGENAME .
+rm -rf $TMPDIR/