diff --git a/Dockerfile b/Dockerfile
index 8973a4e..908e1fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,8 @@
 FROM alpine:3.6
+# This is the release of Consul to pull in.
+ENV CONSUL_VERSION=1.0.6
+# This is the location of the releases.
+ENV HASHICORP_RELEASES=https://releases.hashicorp.com
 RUN apk -v --update add \
         bash \
         python \
@@ -8,11 +12,30 @@ RUN apk -v --update add \
         mailcap \
         jq \
         curl \
+        ca-certificates \
+        gnupg libcap \
+        openssl \
+        su-exec \
         dumb-init \
         && \
     pip install --upgrade awscli==1.14.5 s3cmd==2.0.1 python-magic && \
     apk -v --purge del py-pip && \
     rm /var/cache/apk/*
+# Set up certificates, and Consul.
+RUN gpg --keyserver pgp.mit.edu --recv-keys 91A6E7F85D05C65630BEF18951852D87348FFC4C && \
+    mkdir -p /tmp/build && \
+    cd /tmp/build && \
+    wget ${HASHICORP_RELEASES}/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip && \
+    wget ${HASHICORP_RELEASES}/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_SHA256SUMS && \
+    wget ${HASHICORP_RELEASES}/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_SHA256SUMS.sig && \
+    gpg --batch --verify consul_${CONSUL_VERSION}_SHA256SUMS.sig consul_${CONSUL_VERSION}_SHA256SUMS && \
+    grep consul_${CONSUL_VERSION}_linux_amd64.zip consul_${CONSUL_VERSION}_SHA256SUMS | sha256sum -c && \
+    unzip -d /bin consul_${CONSUL_VERSION}_linux_amd64.zip && \
+    cd /tmp && \
+    rm -rf /tmp/build && \
+    apk del gnupg openssl && \
+    rm -rf /root/.gnupg
+
 COPY scripts/*.sh /usr/local/bin/
 COPY check_definitions/*.sh /usr/local/bin/check_definitions/
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
diff --git a/check_definitions/ecs-cluster.sh b/check_definitions/ecs-cluster.sh
index cd4c796..335570e 100755
--- a/check_definitions/ecs-cluster.sh
+++ b/check_definitions/ecs-cluster.sh
@@ -19,7 +19,7 @@ _SERVICE=$(cat <<EOT
         "docker_container_id": "${DOCKER_ID}",
         "shell": "/bin/bash",
         "args": ["/usr/local/bin/ami_up2date.sh"],
-        "interval": "10s",
+        "interval": "15s",
         "status": "passing"
       },
       {
@@ -31,8 +31,17 @@ _SERVICE=$(cat <<EOT
         "args": ["/usr/local/bin/ecs-cloudwatch-metrics.sh"],
         "interval": "60s",
         "status": "passing"
+      },
+      {
+        "id": "instance-status",
+        "name": "Instance Status",
+        "notes": "Instance and ECS Instance Status",
+        "docker_container_id": "${DOCKER_ID}",
+        "shell": "/bin/bash",
+        "args": ["/usr/local/bin/instance-status.sh"],
+        "interval": "60s",
+        "status": "passing"
       }
-
     ]
   }
 }
diff --git a/scripts/ecs-cloudwatch-metrics.sh b/scripts/ecs-cloudwatch-metrics.sh
index 7f6081f..1025179 100755
--- a/scripts/ecs-cloudwatch-metrics.sh
+++ b/scripts/ecs-cloudwatch-metrics.sh
@@ -11,6 +11,8 @@ ECS_CLUSTER=$(curl -s http://localhost:51678/v1/metadata | jq -r .Cluster)
 CONTAINERINSTANCES=$(aws --region ${REGION} ecs describe-clusters --clusters ${ECS_CLUSTER} | jq .clusters[0].registeredContainerInstancesCount)
 TIMESTAMP=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 
-aws --region ${REGION} cloudwatch put-metric-data --metric-name ContainerInstancesCount --namespace /AWS/ECS --dimensions Cluster=${ECS_CLUSTER} --unit Count --value 1 --timestamp ${TIMESTAMP}
+# Commenting out to save CPU Cycles on smaller instances.
+#aws --region ${REGION} cloudwatch put-metric-data --metric-name ContainerInstancesCount --namespace /AWS/ECS --dimensions Cluster=${ECS_CLUSTER} --unit Count --value 1 --timestamp ${TIMESTAMP}
 aws --region ${REGION} cloudwatch put-metric-data --metric-name registeredContainerInstances --namespace /AWS/ECS --dimensions Cluster=${ECS_CLUSTER} --unit Count --value ${CONTAINERINSTANCES} --timestamp ${TIMESTAMP}
+echo "Sending Metrics to CloudWatch"
 exit 0
diff --git a/scripts/instance-draining-handler.sh b/scripts/instance-draining-handler.sh
new file mode 100755
index 0000000..159f665
--- /dev/null
+++ b/scripts/instance-draining-handler.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+# >>> Currently NOT USED <<<<
+# We probably want to replace this with something that eats json and do this in a non-horrible way
+# It would safe clock time to get status from the JSON input of the consul watch.
+
+REGION=$(curl -s http://169.254.169.254/latest/meta-data/placement/availability-zone/ | sed 's/.$//')
+ARN=$(curl -s http://localhost:51678/v1/metadata | jq -r .ContainerInstanceArn)
+ECS_CLUSTER=$(curl -s http://localhost:51678/v1/metadata | jq -r .Cluster)
+ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id)
+STATUS=$(aws --region $REGION autoscaling describe-auto-scaling-instances --instance-ids $ID | jq -r '.AutoScalingInstances[0].LifecycleState')
+
+if [ $STATUS = "Terminating:Wait" ]; then
+  aws --region $REGION ecs update-container-instances-state --cluster $ECS_CLUSTER --container-instances $ARN --status DRAINING
+  exit 0
+else
+  exit 0
+fi
diff --git a/scripts/instance-status.sh b/scripts/instance-status.sh
new file mode 100755
index 0000000..0bcf80c
--- /dev/null
+++ b/scripts/instance-status.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e 
+
+REGION=$(curl -s http://169.254.169.254/latest/meta-data/placement/availability-zone/ | sed 's/.$//')
+ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id)
+ARN=$(curl -s http://localhost:51678/v1/metadata | jq -r .ContainerInstanceArn)
+ECS_CLUSTER=$(curl -s http://localhost:51678/v1/metadata | jq -r .Cluster)
+#ASG=$(aws ec2 describe-instances --region $REGION --instance-ids $ID | jq -r '.Reservations[0].Instances[0].Tags[1].Value')
+CONTAINER_INSTANCE_STATUS=$(aws --region $REGION ecs describe-container-instances --cluster $ECS_CLUSTER --container-instances "$ARN" | jq -r .containerInstances[0].status)
+STATUS=$(aws --region $REGION autoscaling describe-auto-scaling-instances --instance-ids $ID | jq -r '.AutoScalingInstances[0].LifecycleState')
+
+if [ $STATUS = "InService" ]; then
+  echo Status is Lifecycle State : $STATUS
+  echo ECS Instance Status       : $CONTAINER_INSTANCE_STATUS
+elif [ $STATUS = "Terminating:Wait" ]; then
+  aws --region $REGION ecs update-container-instances-state --cluster $ECS_CLUSTER --container-instances $ARN --status DRAINING
+  echo Status is Lifecycle State : $STATUS
+  echo ECS Instance Status       : $CONTAINER_INSTANCE_STATUS
+  exit 255
+else
+  echo Status is Lifecycle State : $STATUS
+  echo ECS Instance Status       : $CONTAINER_INSTANCE_STATUS
+  exit 1
+fi