diff --git a/terraform/aws/ec2.tf b/terraform/aws/ec2.tf
index 00e0ba940f..6e28371f61 100644
--- a/terraform/aws/ec2.tf
+++ b/terraform/aws/ec2.tf
@@ -11,7 +11,7 @@ resource "aws_instance" "web_host" {
 sudo apt-get update
 sudo apt-get install -y apache2
 sudo systemctl start apache2
-sudo systemctl enable apache2
+sudo systemctl enable apache2 
 export AWS_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMAAA
 export AWS_SECRET_ACCESS_KEY=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
 export AWS_DEFAULT_REGION=us-west-2
@@ -31,6 +31,9 @@ EOF
   })
 }
 
+
+
+
 resource "aws_ebs_volume" "web_host_storage" {
   # unencrypted volume
   availability_zone = "${var.region}a"
@@ -48,8 +51,11 @@ resource "aws_ebs_volume" "web_host_storage" {
     git_repo             = "terragoat"
     yor_trace            = "c5509daf-10f0-46af-9e03-41989212521d"
   })
+  encrypted = false
+  # Joe
 }
 
+
 resource "aws_ebs_snapshot" "example_snapshot" {
   # ebs snapshot without encryption
   volume_id   = "${aws_ebs_volume.web_host_storage.id}"
diff --git a/terraform/aws/main.tf b/terraform/aws/main.tf
new file mode 100644
index 0000000000..03acad6819
--- /dev/null
+++ b/terraform/aws/main.tf
@@ -0,0 +1,32 @@
+provider "aws" {
+  region = "us-east-1"
+}
+
+resource "aws_instance" "example" {
+  ami           = "ami-0c94855ba95c71c99" # Amazon Linux 2 AMI
+  instance_type = "t2.micro"
+  security_groups = [aws_security_group.open_sg.name]
+
+  tags = {
+    Name = "ExampleInstance"
+  }
+}
+
+resource "aws_security_group" "open_sg" {
+  name        = "open_security_group"
+  description = "Security group with all ports open"
+
+  ingress {
+    from_port   = 0
+    to_port     = 65535
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]  # Open to the entire internet
+  }
+
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+}
diff --git a/terraform/aws/rds.tf b/terraform/aws/rds.tf
index b9d5b5aebe..8e3b245c08 100644
--- a/terraform/aws/rds.tf
+++ b/terraform/aws/rds.tf
@@ -92,6 +92,7 @@ resource "aws_rds_cluster" "app6-rds-cluster" {
     git_repo             = "terragoat"
     yor_trace            = "fcffb961-d859-4be5-997f-d51b50665ada"
   }
+  storage_encrypted = true
 }
 
 resource "aws_rds_cluster" "app7-rds-cluster" {
diff --git a/terraform/aws/s3.tf b/terraform/aws/s3.tf
index a2a2ed78fe..6273dcc7cc 100644
--- a/terraform/aws/s3.tf
+++ b/terraform/aws/s3.tf
@@ -20,6 +20,18 @@ resource "aws_s3_bucket" "data" {
   })
 }
 
+
+resource "aws_s3_bucket_versioning" "data" {
+  bucket = aws_s3_bucket.data.id
+
+  versioning_configuration {
+    status = "Enabled"
+  }
+}
+
+
+
+
 resource "aws_s3_bucket_object" "data_object" {
   bucket = aws_s3_bucket.data.id
   key    = "customer-master.xlsx"
@@ -139,3 +151,15 @@ resource "aws_s3_bucket" "logs" {
     yor_trace            = "01946fe9-aae2-4c99-a975-e9b0d3a4696c"
   })
 }
+
+
+resource "aws_s3_bucket" "logs_log_bucket" {
+  bucket = "logs-log-bucket"
+}
+
+resource "aws_s3_bucket_logging" "logs" {
+  bucket = aws_s3_bucket.logs.id
+
+  target_bucket = aws_s3_bucket.logs_log_bucket.id
+  target_prefix = "log/"
+}