diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2eea525
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.env
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 68a49da..416bf9d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,24 +1,7 @@
-This is free and unencumbered software released into the public domain.
+Copyright 2022 Mads Cordes
 
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index c9d1007..efe6625 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,53 @@
 # moths
 
-> e**mo**ji au**ths**
+> e**mo**jicon au**th**entication**s**
 
-# what
+## what
 
-Emojies as TOTP
+Emojies as OTP (2FA)
 
-# why
+## why
 
-Becasue why not?
+Because why not?
 
-# how
+## how
 
-Runnig this is quite easy, just run the command:
+Runnig this is quite easy.
 
-Download the dependencies:
+- Download the dependencies
 
-```sh
-go mod download
-```
+  ```sh
+  go mod download
+  ```
 
-Next-up start the program
+- Make a secret
 
-```sh
-go run .
-```
+  ```sh
+  echo -n "MOTHS_SECRET=" > .env; echo 'moths' | sha256sum | base64 | head -c 32 >> .env
+  ```
+
+- Start the program
+
+  ```sh
+  go run .
+  ```
 
 As I said, easy-peasy!
 
-# sample
+## sample
+
+![four generated OTP's](./data/sample.png)
+
+<details>
+  <summary>v0.1</summary>
+
+A sample out-put might be `😻🙀😺🙀🙀` which would equal the `920811` TOTP-token. Using the super secret secret of `😻` - genereated at `2022/04/28 02:05:42 AM` and a `5`-second interval.
+
+Can be checked out at [`v0.1`](https://github.com/Mobilpadde/moths/tree/v0.1)
 
-A sample out-put might be `😻🙀😺🙀🙀` which would equal the `920811` TOTP-token. Using the super secret secret specified in [`./secret.pem`](./secret.pem) - genereated at `2022/04/28 02:05:42` and a `5`-second interval.
+</details>
 
-# shoutout
+## shoutout
 
 I couldn't have done it without the lovely OSS's listed below:
 
diff --git a/data/sample.png b/data/sample.png
new file mode 100644
index 0000000..2cace64
Binary files /dev/null and b/data/sample.png differ
diff --git a/generator.go b/generator.go
deleted file mode 100644
index 4b22781..0000000
--- a/generator.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package main
-
-import (
-	"encoding/binary"
-	"fmt"
-	"math"
-	"math/bits"
-	"math/rand"
-	"strings"
-)
-
-// randomBufferFromHOTP generates a random buffer from a HOTP token.
-//
-// /!\ Modified /!\
-//
-// Proudly stolen from https://stackoverflow.com/a/48307199/754471
-func randomBufferFromHOTP(otp string) func(step int) ([]byte, error) {
-	buf := []byte(fmt.Sprintf("%08s", otp))
-	seed := int64(binary.BigEndian.Uint64(buf))
-	r := rand.New(rand.NewSource(seed))
-
-	return func(step int) ([]byte, error) {
-		buffer := make([]byte, step)
-		if _, err := r.Read(buffer); err != nil {
-			return nil, err
-		}
-		return buffer, nil
-	}
-}
-
-// MothsGenerator is essentially the nanoid generator with a few modifications.
-//
-// /!\ Modified /!\
-//
-// https://github.com/aidarkhanov/nanoid/blob/master/nanoid.go
-func MothsGenerator(token string, numEmojies int, alphabet ...string) (string, error) {
-	emojiBytes := 4
-	size := emojiBytes * numEmojies
-
-	mask := 2<<uint32(31-bits.LeadingZeros32(uint32(len(alphabet)-1|1))) - 1
-	step := int(math.Ceil(1.6 * float64(mask*size) / float64(len(alphabet))))
-
-	id := new(strings.Builder)
-	id.Grow(size)
-
-	buffer := randomBufferFromHOTP(token)
-	for {
-		randomBuffer, err := buffer(step)
-		if err != nil {
-			return "", err
-		}
-
-		for i := 0; i < step; i++ {
-			currentIndex := int(randomBuffer[i]) & mask
-
-			if currentIndex < len(alphabet) {
-				if _, err := id.WriteString(alphabet[currentIndex]); err != nil {
-					return "", err
-				} else if id.Len() == size {
-					return id.String(), nil
-				}
-			}
-		}
-	}
-}
diff --git a/hotp.go b/hotp.go
deleted file mode 100644
index 4fbcd5d..0000000
--- a/hotp.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"crypto/hmac"
-	"crypto/sha1"
-	"encoding/binary"
-	"fmt"
-	"log"
-	"strconv"
-)
-
-// GetHOTPToken returns a HOTP token for the given secret and interval.
-//
-// /!\ Modified /!\
-//
-// https://github.com/tilaklodha/google-authenticator/blob/master/google_authenticator.go
-func GetHOTPToken(secret string, interval int64) string {
-	key := []byte(fmt.Sprintf("%08s", secret))
-
-	bs := make([]byte, 8)
-	binary.BigEndian.PutUint64(bs, uint64(interval))
-
-	// Signing the value using HMAC-SHA1 Algorithm
-	hash := hmac.New(sha1.New, key)
-	hash.Write(bs)
-	h := hash.Sum(nil)
-
-	// We're going to use a subset of the generated hash.
-	// Using the last nibble (half-byte) to choose the index to start from.
-	// This number is always appropriate as it's maximum decimal 15, the hash will
-	// have the maximum index 19 (20 bytes of SHA1) and we need 4 bytes.
-	o := (h[19] & 15)
-
-	var header uint32
-	// Get 32 bit chunk from hash starting at the o
-	r := bytes.NewReader(h[o : o+4])
-	err := binary.Read(r, binary.BigEndian, &header)
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	// Ignore most significant bits as per RFC 4226.
-	// Takes division from one million to generate a remainder less than < 7 digits
-	h12 := (int(header) & 0x7fffffff) % 1000000
-
-	// Converts number as a string
-	otp := strconv.Itoa(int(h12))
-
-	// Padding with 0s to the left if the OTP is less than 8 digits
-	return fmt.Sprintf("%06s", otp)
-}
diff --git a/main.go b/main.go
index b112df1..f46634c 100644
--- a/main.go
+++ b/main.go
@@ -1,41 +1,39 @@
 package main
 
 import (
-	"io/ioutil"
 	"log"
+	"moths/moths"
+	"os"
+	"strings"
 	"time"
-
-	"github.com/enescakir/emoji"
 )
 
 func main() {
 	log.SetFlags(log.Llongfile | log.LstdFlags)
 
-	data, err := ioutil.ReadFile("secret.pem")
-	if err != nil {
-		log.Fatalln(err)
-	}
+	go func() {
+		interval := 5
+
+		secret := os.Getenv("MOTHS_SECRET")
+		gen, err := moths.NewMoths(secret, interval)
+		if err != nil {
+			log.Fatalln(err)
+		}
 
-	secret := string(data)
-	interval := time.Now().Unix() / 5
+		ticker := time.NewTicker(time.Second * time.Duration(interval))
+		for {
+			select {
+			case <-ticker.C:
+				moth, err := gen.Next(6, moths.ALPHABET_CATSDOG)
+				if err != nil {
+					log.Fatalln(err)
+				}
 
-	otp := GetHOTPToken(secret, interval)
-	moth, err := MothsGenerator(
-		otp,
-		5,
-		emoji.GrinningCat.String(),
-		emoji.GrinningCatWithSmilingEyes.String(),
-		emoji.CatWithTearsOfJoy.String(),
-		emoji.SmilingCatWithHeartEyes.String(),
-		emoji.CatWithWrySmile.String(),
-		emoji.KissingCat.String(),
-		emoji.WearyCat.String(),
-		emoji.CryingCat.String(),
-		emoji.PoutingCat.String(),
-	)
-	if err != nil {
-		log.Fatalln(err)
-	}
+				joint := strings.Join(strings.Split(moth, ""), " ")
+				log.Printf("moth-otp: %s\n", joint)
+			}
+		}
+	}()
 
-	log.Printf("moth-otp: %s => %s\n", moth, otp)
+	select {}
 }
diff --git a/moths/buffer.go b/moths/buffer.go
new file mode 100644
index 0000000..a005dbc
--- /dev/null
+++ b/moths/buffer.go
@@ -0,0 +1,21 @@
+package moths
+
+import (
+	"encoding/binary"
+	"fmt"
+	"math/rand"
+)
+
+func randomBufferFromHOTP(otp string) func(step int) ([]byte, error) {
+	buf := []byte(fmt.Sprintf("%08s", otp))
+	seed := int64(binary.BigEndian.Uint64(buf))
+	r := rand.New(rand.NewSource(seed))
+
+	return func(step int) ([]byte, error) {
+		buffer := make([]byte, step)
+		if _, err := r.Read(buffer); err != nil {
+			return nil, err
+		}
+		return buffer, nil
+	}
+}
diff --git a/moths/config.go b/moths/config.go
new file mode 100644
index 0000000..110221c
--- /dev/null
+++ b/moths/config.go
@@ -0,0 +1,24 @@
+package moths
+
+import "github.com/enescakir/emoji"
+
+var (
+	ALPHABET_CATSDOG = []string{
+		emoji.GrinningCat.String(),
+		emoji.GrinningCatWithSmilingEyes.String(),
+		emoji.CatWithTearsOfJoy.String(),
+		emoji.SmilingCatWithHeartEyes.String(),
+		emoji.CatWithWrySmile.String(),
+		emoji.KissingCat.String(),
+		emoji.WearyCat.String(),
+		emoji.CryingCat.String(),
+		emoji.PoutingCat.String(),
+		emoji.DogFace.String(),
+	}
+)
+
+type Moths struct {
+	secret   string
+	interval int
+	alphabet []string
+}
diff --git a/moths/generator.go b/moths/generator.go
new file mode 100644
index 0000000..24cff49
--- /dev/null
+++ b/moths/generator.go
@@ -0,0 +1,49 @@
+package moths
+
+import (
+	"errors"
+	"math"
+	"math/bits"
+	"strings"
+)
+
+const emojiBytes = 4
+
+func (m *Moths) Next(numEmojies int, alphabet []string) (string, error) {
+	if len(alphabet) < 1 {
+		return "", errors.New("alphabet must be at least 1 character")
+	}
+
+	size := emojiBytes * numEmojies
+	// https://github.com/tilaklodha/google-authenticator
+	mask := 2<<uint32(31-bits.LeadingZeros32(uint32(len(alphabet)-1|1))) - 1
+	step := int(math.Ceil(1.6 * float64(mask*size) / float64(len(alphabet))))
+
+	id := new(strings.Builder)
+	id.Grow(size)
+
+	tkn, err := m.getHOTPToken()
+	if err != nil {
+		return "", err
+	}
+
+	buffer := randomBufferFromHOTP(tkn)
+	for {
+		randomBuffer, err := buffer(step)
+		if err != nil {
+			return "", err
+		}
+
+		for i := 0; i < step; i++ {
+			currentIndex := int(randomBuffer[i]) & mask
+
+			if currentIndex < len(alphabet) {
+				if _, err := id.WriteString(alphabet[currentIndex]); err != nil {
+					return "", err
+				} else if id.Len() == size {
+					return id.String(), nil
+				}
+			}
+		}
+	}
+}
diff --git a/moths/hotp.go b/moths/hotp.go
new file mode 100644
index 0000000..8b594c0
--- /dev/null
+++ b/moths/hotp.go
@@ -0,0 +1,41 @@
+package moths
+
+import (
+	"bytes"
+	"crypto/hmac"
+	"crypto/sha1"
+	"encoding/base32"
+	"encoding/binary"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+)
+
+func (m *Moths) getHOTPToken() (string, error) {
+	ks := strings.ToUpper(m.secret)
+	key, err := base32.StdEncoding.DecodeString(ks)
+	if err != nil {
+		return "", err
+	}
+
+	bs := make([]byte, 8)
+	interval := uint64(time.Now().Unix() / int64(m.interval))
+	binary.BigEndian.PutUint64(bs, interval)
+
+	hash := hmac.New(sha1.New, key)
+	hash.Write(bs)
+	h := hash.Sum(nil)
+	o := (h[19] & 15)
+
+	var header uint32
+	r := bytes.NewReader(h[o : o+4])
+	err = binary.Read(r, binary.BigEndian, &header)
+	if err != nil {
+		return "", err
+	}
+
+	h12 := (int(header) & 0x7fffffff) % 1000000
+	otp := strconv.Itoa(int(h12))
+	return fmt.Sprintf("%06s", otp), nil
+}
diff --git a/moths/new.go b/moths/new.go
new file mode 100644
index 0000000..204d705
--- /dev/null
+++ b/moths/new.go
@@ -0,0 +1,19 @@
+package moths
+
+import "errors"
+
+func NewMoths(secret string, interval int) (*Moths, error) {
+	if len(secret) < 32 {
+		return nil, errors.New("secret must be at least 32 characters")
+	}
+
+	m := &Moths{
+		secret:   secret,
+		interval: interval,
+	}
+
+	if _, err := m.getHOTPToken(); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
diff --git a/secret.pem b/secret.pem
deleted file mode 100644
index f4449b5..0000000
--- a/secret.pem
+++ /dev/null
@@ -1 +0,0 @@
-😻
\ No newline at end of file