diff --git a/modules/encoders/string/base64/base64.pp b/modules/encoders/bases/base32/base32.pp
similarity index 100%
rename from modules/encoders/string/base64/base64.pp
rename to modules/encoders/bases/base32/base32.pp
diff --git a/modules/encoders/string/base64/manifests/.no_puppet b/modules/encoders/bases/base32/manifests/.no_puppet
similarity index 100%
rename from modules/encoders/string/base64/manifests/.no_puppet
rename to modules/encoders/bases/base32/manifests/.no_puppet
diff --git a/modules/encoders/bases/base32/secgen_local/local.rb b/modules/encoders/bases/base32/secgen_local/local.rb
new file mode 100644
index 000000000..ee0679e2c
--- /dev/null
+++ b/modules/encoders/bases/base32/secgen_local/local.rb
@@ -0,0 +1,22 @@
+#!/usr/bin/ruby
+require 'bases'
+require_relative '../../../../../lib/objects/local_string_encoder.rb'
+class BASE32Encoder < StringEncoder
+  def initialize
+    super
+    self.module_name = 'BASE32 Encoder'
+    self.strings_to_encode = ['test']
+  end
+
+  def encode(str)
+    byte_array = str.bytes
+    byte_array.each { |byte|
+      Bases.val(byte).in_hex.to_base(64)
+    }
+    test = Bases.val(binary).in_base(10).to_base(64)
+
+    test
+  end
+end
+
+BASE32Encoder.new.run
diff --git a/modules/encoders/string/base64/secgen_metadata.xml b/modules/encoders/bases/base32/secgen_metadata.xml
similarity index 100%
rename from modules/encoders/string/base64/secgen_metadata.xml
rename to modules/encoders/bases/base32/secgen_metadata.xml
diff --git a/modules/encoders/bases/base64/base64.pp b/modules/encoders/bases/base64/base64.pp
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/encoders/bases/base64/manifests/.no_puppet b/modules/encoders/bases/base64/manifests/.no_puppet
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/encoders/string/base64/secgen_local/local.rb b/modules/encoders/bases/base64/secgen_local/local.rb
similarity index 100%
rename from modules/encoders/string/base64/secgen_local/local.rb
rename to modules/encoders/bases/base64/secgen_local/local.rb
diff --git a/modules/encoders/bases/base64/secgen_metadata.xml b/modules/encoders/bases/base64/secgen_metadata.xml
new file mode 100644
index 000000000..7e86adb73
--- /dev/null
+++ b/modules/encoders/bases/base64/secgen_metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<encoder xmlns="http://www.github/cliffe/SecGen/encoder"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://www.github/cliffe/SecGen/encoder">
+  <name>BASE64 Encoder</name>
+  <author>Z. Cliffe Schreuders</author>
+  <module_license>MIT</module_license>
+  <description>Converts to BASE64 encoding.</description>
+
+  <type>string_encoder</type>
+  <type>ascii_reversible</type>
+  <type>alpha_reversible</type>
+  <platform>linux</platform>
+  <platform>windows</platform>
+
+  <solution>Encoded using Base64. Decoding tools available online e.g. https://www.base64decode.org/</solution>
+
+  <read_fact>strings_to_encode</read_fact>
+  <read_fact>base64_options</read_fact>
+
+  <output_type>encoded_strings</output_type>
+  
+</encoder>
\ No newline at end of file