diff --git a/Go/main.go b/Go/main.go
index 3be919a..dc9e89f 100644
--- a/Go/main.go
+++ b/Go/main.go
@@ -3,29 +3,45 @@ package main
 import (
 	"fmt"
 	"flag"
-	"one-time-pad-utils/otp_gen"
+	"math"
+	"strings"
+	"one-time-pad-utils/otp_generate"
 	"one-time-pad-utils/otp_encrypt"
+	"one-time-pad-utils/otp_decrypt"
 )
 
 func main(){
 	var genpad = flag.Bool("generate", false, "Generate a new One-Time Pad using CSPRNG")
 	var genpadchunks = flag.Int("chunks", 200, "Specify the amount of chunks to generate")
-	var encryptmessage = flag.String("encrypt", "", "Specify a message you wish to encrypt")
-	var decryptmessage = flag.String("decrypt", "", "Specify a message you wish to decrypt")
-	var otpkey = flag.String("key", "", "The specify required key for encryption and decryption")
-	var _ = encryptmessage
-	var _ = decryptmessage
-	var _ = otpkey
+	var encryptmessage = flag.String("encrypt", "", "Specify a message you wish to encrypt (use quotes if you have spaces)")
+	var decryptmessage = flag.String("decrypt", "", "Specify a message you wish to decrypt (use quotes if you have spaces)")
+	var otpkey = flag.String("key", "", "The specify a key for encryption (optional) and decryption (required) (use quotes if you have spaces)")
 
 	flag.Parse()
 
 	if *genpad {
-		fmt.Printf("%v\n", otpgen.GenerateOTP(*genpadchunks))
+		fmt.Printf("%v\n", otpgenerate.GenerateOTP(*genpadchunks))
 		return
 	}
 
 	if *encryptmessage != "" {
-		fmt.Printf("%v\n", otpencrypt.OTPEncrypt(*encryptmessage,*otpkey))
+		if *otpkey != ""{
+			fmt.Printf("%v\n", otpencrypt.OTPEncrypt(*encryptmessage,*otpkey))
+		} else {
+			encryptmessagestring := strings.Replace(*encryptmessage, " ", "", -1)
+			lenofmessage := math.Ceil(float64(len(encryptmessagestring))/float64(5))
+			generated_key := otpgenerate.GenerateOTP(int(lenofmessage))
+			fmt.Printf("GENERATED NEW KEY SINCE NONE WAS SPECIFIED:\n%v\n\n%v\n", generated_key, otpencrypt.OTPEncrypt(*encryptmessage, generated_key))
+		}
+		return
+	}
+
+	if *decryptmessage != "" {
+		if *otpkey != ""{
+			fmt.Printf("%v\n", otpdecrypt.OTPDecrypt(*decryptmessage,*otpkey))
+		} else {
+			fmt.Println("PLEASE SUPPLY A KEY")
+		}
 		return
 	}
 	
diff --git a/Go/one-time-pad-utils b/Go/one-time-pad-utils
deleted file mode 100755
index 82831fd..0000000
Binary files a/Go/one-time-pad-utils and /dev/null differ
diff --git a/Go/otp_decrypt/otp_decrypt.go b/Go/otp_decrypt/otp_decrypt.go
new file mode 100644
index 0000000..99beb5d
--- /dev/null
+++ b/Go/otp_decrypt/otp_decrypt.go
@@ -0,0 +1,47 @@
+package otpdecrypt
+
+import (
+	"strings"
+	"one-time-pad-utils/pad_definitions"
+)
+
+func OTPDecrypt(message string, key string) string {
+	message = strings.Replace(message, " ", "", -1)
+	messagesplit := strings.Split(message,"")
+	var messagesplitint []int
+
+	key = strings.Replace(key, " ", "", -1)
+	keysplit := strings.Split(key,"")
+	var keysplitint []int
+
+	for _, char := range messagesplit {
+		for n, c := range paddefinitions.NumToCharMap{
+			if c == strings.ToUpper(char) {
+				messagesplitint = append(messagesplitint, n)
+			
+			}
+		}
+	}
+	
+	for _, char := range keysplit {
+		for n, c := range paddefinitions.NumToCharMap{
+			if c == strings.ToUpper(char) {
+				keysplitint = append(keysplitint, n)
+			
+			}
+		}
+	}
+
+	if len(keysplitint) < len(messagesplitint) {
+		return ("KEY TOO SHORT TO DECRYPT MESSAGE")
+	}
+
+	var decryptedmessage []string
+
+	for pos, messagenum := range messagesplitint{
+		decryptedmessage = append(decryptedmessage, paddefinitions.NumToCharMap[(((messagenum - keysplitint[pos]) % 35) + 35) % 35]) // crazy modulo for decryption
+
+	}
+
+	return (strings.Join(decryptedmessage, ""))
+}
diff --git a/Go/otp_encrypt/otp_encrypt.go b/Go/otp_encrypt/otp_encrypt.go
index 2b1227f..ad1e63e 100644
--- a/Go/otp_encrypt/otp_encrypt.go
+++ b/Go/otp_encrypt/otp_encrypt.go
@@ -39,13 +39,11 @@ func OTPEncrypt(message string, key string) string {
 	var encryptedmessage []string
 
 	for pos, messagenum := range messagesplitint{
+		if pos != 0 && pos % 5 == 0 {
+			encryptedmessage = append(encryptedmessage, " ")
+		}
 		encryptedmessage = append(encryptedmessage, paddefinitions.NumToCharMap[(messagenum + keysplitint[pos]) % 35])
-
 	}
 
-
-
 	return (strings.Join(encryptedmessage, ""))
-
-
 }
diff --git a/Go/otp_gen/otp_gen.go b/Go/otp_generate/otp_gen.go
similarity index 97%
rename from Go/otp_gen/otp_gen.go
rename to Go/otp_generate/otp_gen.go
index 49d95f6..fb8e4d1 100644
--- a/Go/otp_gen/otp_gen.go
+++ b/Go/otp_generate/otp_gen.go
@@ -1,6 +1,6 @@
 //One-Time Pad generator
 
-package otpgen
+package otpgenerate
 
 import (
 	"crypto/rand"