diff --git a/main.tf b/main.tf
index 7e294c0..75de574 100644
--- a/main.tf
+++ b/main.tf
@@ -135,3 +135,11 @@ resource "aws_iam_access_key" "audit" {
   pgp_key = var.pgp_key
 }
 
+resource "null_resource" "audit_output" {
+  count = length(var.users)
+  triggers = {
+    user = element(aws_iam_user.audit[*].name,count.index)
+    aws_access_key_id = element(aws_iam_access_key.audit[*].id,count.index)
+    aws_secret_access_key = element(aws_iam_access_key.audit[*].encrypted_secret,count.index)
+  }
+}
diff --git a/outputs.tf b/outputs.tf
index e880d04..a9323cd 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,24 +1,28 @@
 output "user" {
   description = "Users created"
-  value       = [aws_iam_user.audit.*.name]
+  value       = aws_iam_user.audit[*].name
 }
 
 output "aws_access_key_id" {
   description = "Access Key IDs for Users"
-  value       = aws_iam_access_key.audit.*.id
+  value       = aws_iam_access_key.audit[*].id
 }
 
 locals {
-  encrypted_secret = join(",", aws_iam_access_key.audit.*.encrypted_secret)
-
+#  encrypted_secret = join(",", aws_iam_access_key.audit.*.encrypted_secret)
   #  encrypted_secret = "${join(",",aws_iam_access_key.audit.*.secret)}"
   #  notencrypted_secret = "${join(",",aws_iam_access_key.audit.*.secret)}"
   #  secret              = "${var.pgp_key == "" ? local.notencrypted_secret : local.encrypted_secret}"
-  secret = local.encrypted_secret
+#  secret = local.encrypted_secret
 }
 
 output "aws_secret_access_key" {
   description = "Access Secret Key IDs for Users"
-  value       = [split(",", local.secret)]
+#  value       = [split(",", local.secret)]
+  value       = aws_iam_access_key.audit[*].encrypted_secret
 }
 
+output "aws_info" {
+  description = "Access key, secret, and user map output"
+  value = null_resource.audit_output[*].triggers
+}