45 changed files with 144 additions and 2635 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -20,45 +20,44 @@ jobs:
      - name: Get Version
        id: get_version
        uses: battila7/get-version-action@v2.0.0
+
+      - name: Setup Golang 1.15
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.15
      
-      - name: install buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
-        with:
-          version: latest
+      - name: Install go-bindata and build migrations
+        env:
+          GOPATH: /home/runner/work/Geeksbot/
+        run: |
+            go get -u github.com/go-bindata/go-bindata/...
+            /home/runner/work/Geeksbot/bin/go-bindata -pkg migrations -o $GITHUB_WORKSPACE/internal/database/migrations/bindata.go $GITHUB_WORKSPACE/internal/database/migrations/
+            head $GITHUB_WORKSPACE/internal/database/migrations/bindata.go

-      - name: Docker Login
-        # You may pin to the exact commit or the version.
-        # uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        uses: docker/login-action@v1.10.0
-        with:
-          registry: ${{ secrets.DR_URL }}
-          # Username used to log against the Docker registry
-          username: ${{ secrets.DH_USERNAME }}
-          # Password or personal access token used to log against the Docker registry
-          password: ${{ secrets.DH_PASSWORD }}
-          # Log out from the Docker registry at the end of a job
-          logout: true
-
-      - name: Docker Build & Push
+      - name: Build container image
        env:
          IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
-        run: |
-          docker buildx build --push \
-          --tag ${{ secrets.DR_URL }}/geeksbot:$IMAGE_TAG \
-          --platform linux/amd64,linux/arm/v7,linux/arm64 . 
+        run: docker build -t registry.digitalocean.com/djpianalto/geeksbot:$IMAGE_TAG .
+
+      - name: Install doctl
+        uses: digitalocean/action-doctl@v2
+        with:
+          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+
+      - name: Login to DigitalOcean Container Registry with short-lived credentials
+        run: doctl registry login --expiry-seconds 600
+
+      - name: Push image to DigitalOcean Container Registry
+        run: docker push registry.digitalocean.com/djpianalto/geeksbot

      - name: Update deployment file
-        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|${{ secrets.DR_URL }}/geeksbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
+        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|registry.digitalocean.com/djpianalto/geeksbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml

-      - uses: azure/k8s-set-context@v1
-        with:
-          method: kubeconfig
-          kubeconfig: ${{ secrets.KUBE_CONFIG }}
-        id: setcontext
+      - name: Save DigitalOcean kubeconfig with short-lived credentials
+        run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 discord-bots

-      - name: Deploy to Kubernetes
+      - name: Deploy to DigitalOcean Kubernetes
        run: kubectl apply -f $GITHUB_WORKSPACE/deployment.yml

      - name: Verify deployment
-        run: kubectl rollout status -n discord-bots deployment/geeksbot
+        run: kubectl rollout status deployment/geeksbot
--- a/channel.go
+++ b/channel.go
@ -9,10 +9,9 @@ type Channel struct {
 }

 type ChannelService interface {
-	Channel(id string) (Channel, error)
-	CreateChannel(c Channel) (Channel, error)
-	DeleteChannel(c Channel) error
-	GuildChannels(g Guild) ([]Channel, error)
-	UpdateChannel(c Channel) (Channel, error)
-	GetOrCreateChannel(id string, guild_id string) (Channel, error)
+	Channel(id string) (*Channel, error)
+	CreateChannel(c *Channel) (*Channel, error)
+	DeleteChannel(c *Channel) error
+	GuildChannels(g *Guild) ([]*Channel, error)
+	UpdateChannel(c *Channel) (*Channel, error)
 }
--- a/cmd/geeksbot/main.go
+++ b/cmd/geeksbot/main.go
@ -8,9 +8,8 @@ import (

 	"github.com/bwmarrin/discordgo"
 	"github.com/dustinpianalto/disgoman"
+	"github.com/dustinpianalto/geeksbot/internal/database"
 	"github.com/dustinpianalto/geeksbot/internal/exts"
-	"github.com/dustinpianalto/geeksbot/pkg/database"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
 )

 func main() {
@ -28,8 +27,11 @@ func main() {
 	}

 	database.ConnectDatabase(os.Getenv("DATABASE_URL"))
-	//database.RunMigrations()
-	services.InitializeServices()
+	//postgres.InitializeDatabase()
+	//utils.LoadTestData()
+
+	//us := &postgres.UserService{DB: postgres.DB}
+	//gs := &postgres.GuildService{DB: postgres.DB}

 	owners := []string{
 		"351794468870946827",
@ -47,9 +49,18 @@ func main() {

 	// Add Command Handlers
 	exts.AddCommandHandlers(&manager)
+	//services.InitalizeServices(us, gs)
+
+	//if _, ok := handler.Commands["help"]; !ok {
+	//	handler.AddDefaultHelpCommand()
+	//}

 	dg.AddHandler(manager.OnMessage)
 	dg.AddHandler(manager.StatusManager.OnReady)
+	//dg.AddHandler(guild_management.OnMessageUpdate)
+	//dg.AddHandler(guild_management.OnMessageDelete)
+	//dg.AddHandler(user_management.OnGuildMemberAddLogging)
+	//dg.AddHandler(user_management.OnGuildMemberRemoveLogging)

 	err = dg.Open()
 	if err != nil {
@ -60,6 +71,9 @@ func main() {
 	// Start the Error handler in a goroutine
 	go ErrorHandler(manager.ErrorChannel)

+	// Start the Logging handler in a goroutine
+	//go logging.LoggingHandler(logging.LoggingChannel)
+
 	log.Println("The Bot is now running.")
 	sc := make(chan os.Signal, 1)
 	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
@ -73,11 +87,7 @@ func main() {
 }

 func getPrefixes(guildID string) []string {
-	guild, err := services.GuildService.Guild(guildID)
-	if err != nil || len(guild.Prefixes) == 0 {
-		return []string{"G$", "g$"}
-	}
-	return guild.Prefixes
+	return []string{"G.", "g."}
 }

 func ErrorHandler(ErrorChan chan disgoman.CommandError) {
--- a/deployment.yml
+++ b/deployment.yml
@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: geeksbot
-  namespace: discord-bots
+  namespace: default
  labels:
    app: geeksbot
 spec:
@ -21,42 +21,8 @@ spec:
        app: geeksbot
    spec:
      containers:
-        - name: pgbouncer
-          image: timoha/pgbouncer:1.15.0
-          resources:
-            requests:
-              memory: "256Mi"
-              cpu: "0.5"
-            limits:
-              memory: "512Mi"
-              cpu: "1"
-          env:
-            - name: DATABASE_URL
-              valueFrom:
-                secretKeyRef:
-                  name: geeksbot
-                  key: pgbouncer_url
-            - name: SERVER_TLS_SSLMODE
-              valueFrom:
-                secretKeyRef:
-                  name: geeksbot
-                  key: pgbouncer_ssl
-            - name: AUTH_TYPE
-              valueFrom:
-                secretKeyRef:
-                  name: geeksbot
-                  key: pgbouncer_auth
-          ports:
-            - containerPort: 5432
        - name: geeksbot
          image: <IMAGE>
-          resources:
-            requests:
-              memory: "512Mi"
-              cpu: "1"
-            limits:
-              memory: "1Gi"
-              cpu: "2"
          env:
            - name: DATABASE_URL
              valueFrom:
@ -68,5 +34,3 @@ spec:
                secretKeyRef:
                  name: geeksbot
                  key: discord_token
-      imagePullSecrets:
-        - name: registry-1
--- a/go.mod
+++ b/go.mod
@ -8,7 +8,5 @@ require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
 	github.com/golang-migrate/migrate v3.5.4+incompatible // indirect
 	github.com/golang-migrate/migrate/v4 v4.14.1
-	github.com/gorcon/rcon v1.3.1
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/lib/pq v1.8.0
 )
--- a/go.sum
+++ b/go.sum
@ -152,8 +152,6 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/gorcon/rcon v1.3.1 h1:z6a5iOlojfdkvA1qaKEng7QfCJuCzYlC9BUDs6/M+74=
-github.com/gorcon/rcon v1.3.1/go.mod h1:2gztBPSV2WxkPkqV4jiJkdHs+NT46mNSGb8JxbPesx4=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@ -296,7 +294,6 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg=
 golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
--- a/guild.go
+++ b/guild.go
@ -1,29 +1,25 @@
 package geeksbot

-import "database/sql"
-
 type Guild struct {
 	ID               string
-	NewPatronMessage sql.NullString
+	NewPatronMessage string
 	Prefixes         []string
 }

 type Role struct {
 	ID       string
-	RoleType string
+	RoleType int
 	Guild    Guild
 }

 type GuildService interface {
-	Guild(id string) (Guild, error)
-	CreateGuild(g Guild) (Guild, error)
-	DeleteGuild(g Guild) error
-	UpdateGuild(g Guild) (Guild, error)
-	GuildRoles(g Guild) ([]Role, error)
-	CreateRole(r Role) (Role, error)
-	Role(id string) (Role, error)
-	UpdateRole(r Role) (Role, error)
-	DeleteRole(r Role) error
-	GetOrCreateGuild(id string) (Guild, error)
-	CreateOrUpdateRole(r Role) (Role, error)
+	Guild(id string) (*Guild, error)
+	CreateGuild(g *Guild) (*Guild, error)
+	DeleteGuild(g *Guild) error
+	UpdateGuild(g *Guild) (*Guild, error)
+	GuildRoles(g *Guild) ([]*Role, error)
+	CreateRole(r *Role) (*Role, error)
+	Role(id string) (*Role, error)
+	UpdateRole(r *Role) (*Role, error)
+	DeleteRole(r *Role) error
 }
--- a/internal/database/database.go
+++ b/internal/database/database.go
@ -5,26 +5,22 @@ import (
 	"fmt"
 	"log"

-	"github.com/dustinpianalto/geeksbot/pkg/database/migrations"
+	"github.com/dustinpianalto/geeksbot/internal/database/migrations"
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database/postgres"
 	bindata "github.com/golang-migrate/migrate/v4/source/go_bindata"
 )

 var (
-	db             *sql.DB
-	GuildService   guildService
-	UserService    userService
-	ChannelService channelService
-	MessageService messageService
-	RequestService requestService
-	PatreonService patreonService
-	ServerService  serverService
+	db *sql.DB
 )

 func ConnectDatabase(dbConnString string) {
-	var err error
-	db, err = sql.Open("postgres", dbConnString)
+	s := bindata.Resource(migrations.AssetNames(),
+		func(name string) ([]byte, error) {
+			return migrations.Asset(name)
+		})
+	db, err := sql.Open("postgres", dbConnString)
 	if err != nil {
 		log.Fatal(fmt.Errorf("Can't connect to the database: %w", err))
 	}
@ -32,15 +28,6 @@ func ConnectDatabase(dbConnString string) {
 	db.SetMaxOpenConns(75)
 	db.SetMaxIdleConns(5)
 	db.SetConnMaxLifetime(300)
-	initServices()
-	log.Println("Services Initialized")
-}
-
-func RunMigrations() {
-	s := bindata.Resource(migrations.AssetNames(),
-		func(name string) ([]byte, error) {
-			return migrations.Asset(name)
-		})
 	d, err := bindata.WithInstance(s)
 	if err != nil {
 		log.Fatal(fmt.Errorf("cannot load migrations: %w", err))
@ -49,28 +36,13 @@ func RunMigrations() {
 	if err != nil {
 		log.Fatal(fmt.Errorf("cannot create db driver: %w", err))
 	}
-	m, err := migrate.NewWithInstance("go-bindatafoo", d, "postgres", instance)
+	m, err := migrate.NewWithInstance("go-bindata", d, "postgres", instance)
 	if err != nil {
 		log.Fatal(fmt.Errorf("cannot create migration instance: %w", err))
 	}
 	err = m.Up()
 	if err != nil {
-		if err.Error() == "no change" {
-			log.Println(err)
-		} else {
-			log.Fatal(err)
-		}
+		log.Fatal(fmt.Errorf("error running migrations: %w", err))
 	}
 	log.Println("Migrations Run")
-
-}
-
-func initServices() {
-	GuildService = guildService{db: db}
-	UserService = userService{db: db}
-	ChannelService = channelService{db: db}
-	MessageService = messageService{db: db}
-	PatreonService = patreonService{db: db}
-	RequestService = requestService{db: db}
-	ServerService = serverService{db: db}
 }
--- a/internal/database/migrations/000001_init_schema.down.sql
+++ b/internal/database/migrations/000001_init_schema.down.sql
--- a/internal/database/migrations/000001_init_schema.up.sql
+++ b/internal/database/migrations/000001_init_schema.up.sql
@ -5,7 +5,7 @@ BEGIN;
        prefixes varchar(10)[],
        PRIMARY KEY(id)
    );
-    CREATE TYPE role_type as ENUM (
+    CREATE TYPE IF NOT EXISTS role_type as ENUM (
        'normal',
        'moderator',
        'admin',
@ -25,7 +25,7 @@ BEGIN;
        id varchar(30),
        guild_id varchar(30),
        admin boolean,
-        default_channel boolean,
+        default boolean,
        new_patron boolean,
        PRIMARY KEY(id),
        CONSTRAINT fk_guild
@ -45,7 +45,7 @@ BEGIN;
        id varchar(30),
        created_at timestamp,
        modified_at timestamp,
-        content varchar(2000),
+        content varchar(2000)
        previous_content varchar(2000)[],
        channel_id varchar(30),
        author_id varchar(30),
@ -89,7 +89,7 @@ BEGIN;
                REFERENCES roles(id)
                ON DELETE SET NULL,
        CONSTRAINT fk_tier
-            FOREIGN KEY(next_tier)
+            FOREIGN_KEY(next_tier)
                REFERENCES patreon_tier(id)
                ON DELETE SET NULL
    );
--- a/internal/database/migrations/bindata.go
+++ b/internal/database/migrations/bindata.go
@ -98,7 +98,7 @@ func _000001_init_schemaDownSql() (*asset, error) {
 	return a, nil
 }

-var __000001_init_schemaUpSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x58\x5d\x6f\xa3\x38\x14\x7d\xef\xaf\xf0\x5b\x12\x69\x1f\xba\xbb\xda\xa7\x3e\xd1\xc4\xad\xd0\x26\xa4\x22\x54\xbb\xd1\x68\x84\xdc\x70\x93\x7a\x0a\x36\x63\x3b\x69\xfb\xef\x47\x50\x3e\x1c\xc0\xe0\x51\x99\x6a\xca\x53\xe4\x7b\xb1\x8f\xcf\x3d\xf7\x83\x5c\xe3\x5b\xd7\xbb\xba\x40\x08\xa1\xb9\x8f\x9d\x00\xa3\xc0\xb9\x5e\x62\xe4\xde\x20\x6f\x1d\x20\xfc\xbf\xbb\x09\x36\xe8\x70\xa4\x71\x24\xd1\x34\xf7\xcb\x1e\x1a\xa1\x13\x11\xbb\x47\x22\xa6\x7f\x5f\xce\xfe\xa8\xd6\x19\x3c\x87\x29\x51\x82\xb3\x30\x01\x29\xc9\x01\x2a\xbf\x3f\x2f\x2f\x75\xcf\x54\xc0\x9e\xbe\x80\xd4\xec\xb3\x2f\x5f\x6b\xfb\x9d\xef\xae\x1c\x7f\x8b\xfe\xc5\xdb\x29\x8d\x66\xf9\xfa\xec\x1c\xe8\xf6\x0e\x23\xc1\x63\x08\xd5\x6b\x0a\x88\x48\x84\xbd\xfb\x95\x06\x72\xc2\xb8\x48\x48\x3c\xa9\x37\x9d\x24\x3c\x02\x41\x14\x17\xfa\x22\x89\x12\xca\xf4\x85\xec\x06\xc0\xd9\xa4\xeb\xd0\x0e\x76\x32\x0c\x36\xe4\xd4\x58\xab\x5f\xb5\x31\xa7\x38\x34\xbd\xda\x60\xa3\x36\xcc\xd7\xde\x26\xf0\x1d\xd7\x0b\xd0\xfe\x29\xcc\x37\xa9\x6c\xd9\x73\xb3\xf6\xb1\x7b\xeb\xe5\x2f\x96\x47\xcc\xce\x3c\xb2\xc7\xc7\x37\xd8\xc7\xde\x1c\x97\xa1\x9e\x76\x79\xad\x3d\xb4\xc0\x4b\x1c\x60\x34\x77\x36\x73\x67\x81\x2d\xf9\xd9\x3d\x12\xc6\x20\xb6\xa1\xa8\x9f\x85\x3c\x50\xe8\x81\xf3\x18\x08\xab\x97\x23\xd8\x93\x63\xac\xc2\xe2\x9c\xb6\x43\xad\xca\xb6\xed\x53\x33\x7b\x94\x20\x6c\x68\x95\x0a\x48\x62\xa6\x75\xa7\xe8\x09\xda\xd4\x48\x45\xf6\xfb\xf6\xb2\x21\x0a\x16\x09\xdb\x71\x83\xa2\x4a\xd8\x5c\x62\x27\x80\x28\x88\x42\xa2\x90\xa2\x09\x48\x45\x92\xb4\xb6\x26\x3c\xa2\x7b\x6a\x34\xef\x38\x53\xc0\x54\xb5\xf3\x5f\xad\x6a\x74\xa2\xfc\x28\xc3\x4e\x3f\xbd\x2e\x15\x22\x33\x93\x79\x54\x8f\x5c\x18\xcd\x90\x3c\x40\x84\xbe\x49\xce\x3a\x0e\xcf\x8d\x32\xb7\xf6\x94\x42\x93\x44\x0b\x64\x46\x91\xd6\xc8\x7b\x65\x5a\x66\xab\x9d\x50\x4d\x60\x32\x65\x1a\x91\x54\x1c\xf5\x02\xc9\xc5\x3d\x80\x62\x83\x03\xe4\xdd\x2f\x97\x96\x6a\x2b\x0a\x7b\x98\x4b\x89\x8b\x73\xd1\x51\xa6\xe0\x00\x02\xdd\x62\x0f\xfb\x4e\x80\x17\xc8\x59\xfe\xe7\x6c\x37\xc8\xd9\x20\x77\x81\xbd\xc0\x0d\xb6\x0d\x35\x72\xa1\xb7\x37\x2d\x32\x31\x65\x4f\xba\x86\xac\x4b\xdc\xa7\x2e\x47\x25\xbd\x8a\x42\x83\xdb\x9f\x24\x97\x91\x04\x0c\xcc\x46\x20\x77\x82\xa6\x8a\x72\x66\x1a\x2d\xca\xd0\x14\x67\x9e\x37\x60\xd3\xdc\xf2\xa2\xde\x60\xb7\x5e\xb2\xcd\xbe\xb7\x43\xcd\xd9\xf7\x66\xef\x0d\x49\x43\x9e\xef\xcb\xc0\xec\xb2\x46\x34\x99\xb1\x17\x4a\x3e\xd3\x58\x26\x9f\x09\x41\xc6\xa7\x11\x41\xc5\xb8\x15\x23\x99\xe3\xb8\xa5\x40\xc0\xf7\x23\x48\x25\xdf\x53\x03\x06\x6a\xfd\x50\xab\x68\xf6\x9a\x86\x8c\x0b\x84\x3d\x2d\x2d\x49\x63\xb0\xb0\xb7\x7b\x75\xfd\xea\xc3\x6b\x37\xb6\xa2\x2f\xf7\x60\x2f\x77\x18\x98\xf3\x2d\xd3\xe7\x83\xfa\xc5\x40\xce\xfc\x56\x2d\x54\x0f\x92\x19\x91\xe6\x34\x5a\x37\x35\x21\x2a\x42\x6d\x04\x53\x8b\xa6\x17\x4a\x39\xf3\x8d\xfb\x91\xc1\x93\x04\xd8\x2f\xcd\xe7\x22\x21\xc3\x7a\xdf\xb3\x7c\xc8\x8e\xb7\x9c\x3e\x3f\x73\x8e\x14\x2c\x98\x5b\x4b\xc5\x52\x7f\x83\x29\xea\xef\xa8\x22\x90\x20\x4e\xad\x2f\xa2\xd1\x46\x0f\x9a\x86\x24\x8a\x04\x48\xed\x4f\x8b\x7f\xf4\x8f\x08\x2e\x54\x5b\x19\x29\x91\xf2\x99\x8b\xc8\x30\x0e\x92\x18\x84\x92\xe1\x50\xaf\xe8\x9f\x1a\x29\xdb\xf3\xc1\x2d\x72\xa7\xa1\xba\x2e\x41\x29\xca\x0e\x72\xd0\xd1\x52\xb3\xf9\xf5\x06\xeb\x6a\x8b\x84\x31\xca\xeb\x50\x35\xfb\xe0\x19\xda\x04\x43\x8f\x9d\x11\x4d\x23\xc0\x1f\x41\x8f\x2e\x97\x7e\x5c\xe3\x96\xfd\x21\x5c\x4d\x85\x1a\xb1\x75\x48\x79\x4c\x7c\x65\x49\x9a\xaf\x57\x2b\x37\xb8\xba\xf8\x11\x00\x00\xff\xff\xb3\xc0\x11\x7f\x4a\x15\x00\x00")
+var __000001_init_schemaUpSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x58\x4d\x6f\xab\x38\x14\xdd\xf7\x57\x78\x97\x44\xea\xa2\x33\xa3\x59\x75\x45\x13\xb7\x42\x93\x90\x8a\x50\xcd\x44\xa3\x11\x72\xc3\x4d\xea\x29\xd8\x3c\xdb\x49\xdb\x7f\xff\x04\xe5\xc3\x01\x0c\x7e\x2a\xaf\x7a\x65\x15\xf9\x5e\xec\xe3\x73\xcf\xfd\x08\x37\xf8\xce\xf5\xae\x2f\x10\x42\x68\xee\x63\x27\xc0\x28\x70\x6e\x96\x18\xb9\xb7\xc8\x5b\x07\x08\xff\xe3\x6e\x82\x0d\x3a\x1c\x69\x1c\x49\x34\xcd\xfd\xb2\x87\x46\xe8\x44\xc4\xee\x89\x88\xe9\x1f\x57\xb3\xcb\x6a\x9d\xc1\x4b\x98\x12\x25\x38\x0b\x13\x90\x92\x1c\xa0\xf2\xfb\xed\xea\x4a\xf7\x4c\x05\xec\xe9\x2b\x48\xcd\x3e\xfb\xf7\xbf\xda\x7e\xef\xbb\x2b\xc7\xdf\xa2\xbf\xf0\x76\x4a\xa3\x59\xbe\x3e\x3b\x07\xba\xbd\x6f\xe2\x14\x3c\x86\x50\xbd\xa5\x80\x88\x44\xd8\x7b\x58\x69\x90\x27\x8c\x8b\x84\xc4\x93\xfa\x88\x49\xc2\x23\x10\x44\x71\xa1\x2f\x92\x28\xa1\x4c\x5f\xc8\xee\x03\x9c\x4d\xba\x20\x74\x70\x95\x61\xb0\xa1\xaa\xc6\x5a\xfd\xaa\x8d\x39\xe1\xa1\xe9\xd5\x06\x37\xb5\x61\xbe\xf6\x36\x81\xef\xb8\x5e\x80\xf6\xcf\x61\xbe\x49\x65\xcb\x9e\xdb\xb5\x8f\xdd\x3b\x2f\x7f\xb1\x3c\x62\x76\xe6\x91\x3d\x3e\xbe\xc5\x3e\xf6\xe6\xb8\x0c\xfc\xb4\xcb\x6b\xed\xa1\x05\x5e\xe2\x00\xa3\xb9\xb3\x99\x3b\x0b\x6c\xc9\xcf\xee\x89\x30\x06\xb1\x0d\x45\xfd\x2c\xe4\x81\x42\x8f\x9c\xc7\x40\x58\xbd\x1c\xc1\x9e\x1c\x63\xd5\x36\xd4\xda\x6c\xdb\xbe\x34\xa3\x47\x09\xc2\x86\x4e\xa9\x80\x24\x66\x3a\x77\x8a\x9e\xa0\x4d\x8d\x54\x64\xbf\x6f\x2f\x1b\xd8\xb7\x48\xdb\x8e\x1b\x14\xb5\xc2\xe6\x12\x3b\x01\x44\x41\x14\x12\x85\x14\x4d\x40\x2a\x92\xa4\xb5\x35\xe1\x11\xdd\x53\xa3\x79\xc7\x99\x02\xa6\xaa\x9d\x7f\xcf\x6a\x92\x5e\x92\x4e\x94\x1f\x65\xd8\xe9\xa6\x17\xa7\x42\xc3\x66\x2e\x8f\xea\x89\x0b\xa3\x19\x92\x47\x88\xd0\xff\x92\xb3\xcb\xf6\xe1\xb9\x51\xe6\xd6\x9e\x7a\x68\x52\x68\x81\xcc\xa8\xd1\x1a\x79\xaf\x4a\xcb\x24\xb5\xd3\xa9\x09\x4c\x26\x4c\x23\x92\x8a\xa3\x5e\x20\xb9\xb6\x07\x50\x6c\x70\x80\xbc\x87\xe5\xd2\x52\x6c\x45\x3d\x0f\x73\x25\x71\x71\xae\x39\xca\x14\x1c\x40\xa0\x3b\xec\x61\xdf\x09\xf0\x02\x39\xcb\xbf\x9d\xed\x06\x39\x1b\xe4\x2e\xb0\x17\xb8\xc1\xb6\x21\x46\x2e\xf4\x1e\xa7\x45\x26\xa6\xec\x59\xd7\x90\x75\x65\xfb\xd2\xd5\xa8\xa4\x57\x51\x68\x70\xfb\x83\xe4\x32\x92\x80\x81\xd9\x08\xe4\x4e\xd0\x54\x51\xce\x4c\xf3\x45\x19\x9a\xe2\xcc\xf3\xbe\x6b\x1a\x5e\x5e\xd5\x3b\xec\xd6\x4b\xb6\xd9\xf7\x7e\xa8\x39\xfb\xde\xed\xbd\x21\x69\xc8\xf3\x63\x19\x98\x5d\xd6\x88\x26\x33\xf6\x42\xc9\x47\x19\xcb\xe4\x33\x21\xc8\xf8\xec\x42\x10\x66\x08\x2a\xc6\xad\x18\xc9\x1c\xc7\x2d\x05\x02\xbe\x1d\x41\x2a\xf9\x91\x1a\x30\x50\xeb\x87\x5a\x45\xb3\xd7\x34\x64\x5c\x20\xec\xe9\x68\x49\x1a\x83\x85\xbd\xdd\xaa\xeb\x57\x1f\xdf\xba\xb1\x15\x6d\xb9\x07\x7b\xb9\xc3\xc0\xb0\x6f\x99\x3e\x9f\xd4\x2f\x06\x72\xe6\x97\x6a\xa1\x7a\x90\xcc\x88\x34\xa7\xd1\xba\xa9\x09\x51\x11\x6a\x23\x98\x5a\x34\xbd\x50\xca\x91\x6f\xdc\xff\x16\x3c\x49\x80\xfd\xd4\x7c\x2e\x12\x32\xac\xf7\x3d\xcb\x87\xec\x78\xcb\xe1\xf3\x2b\xe7\x48\xc1\x82\xb9\xb5\x54\x2c\xf5\x37\x98\xa2\xfe\x8e\x2a\x02\x09\xe2\xd4\xfa\x43\x34\xda\xe8\x41\xd3\x90\x44\x91\x00\xa9\x7d\xb9\xf8\x53\xff\xae\xc1\x85\x6a\x2b\x23\x25\x52\xbe\x70\x11\x19\xc6\x41\x12\x83\x50\x32\x1c\xea\x15\xfd\x53\x23\x65\x7b\x3e\xb8\x45\xee\x34\x54\xd7\x25\x28\x45\xd9\x41\x0e\x3a\x5a\x6a\x36\xbf\xde\x60\x5d\x6d\x91\x30\x46\x79\x1d\xaa\x66\x9f\x3c\x43\x9b\x60\xe8\xb1\x33\xa2\x69\x04\xf8\x33\xe8\xd1\xe5\xd2\x8f\x6b\xdc\xb2\x3f\x84\xab\xa9\x50\x23\xb6\x0e\x29\x8f\x89\xaf\x2c\x49\xf3\xf5\x6a\xe5\x06\xd7\x17\xdf\x03\x00\x00\xff\xff\x77\x2d\xda\x08\x4f\x15\x00\x00")

 func _000001_init_schemaUpSqlBytes() ([]byte, error) {
 	return bindataRead(
@ -113,7 +113,7 @@ func _000001_init_schemaUpSql() (*asset, error) {
 		return nil, err
 	}

-	info := bindataFileInfo{name: "000001_init_schema.up.sql", size: 5450, mode: os.FileMode(420), modTime: time.Unix(1611216889, 0)}
+	info := bindataFileInfo{name: "000001_init_schema.up.sql", size: 5455, mode: os.FileMode(420), modTime: time.Unix(1611206743, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
--- a/internal/discord_utils/channel_utils.go
+++ b/internal/discord_utils/channel_utils.go
@ -1,11 +0,0 @@
-package discord_utils
-
-import "github.com/dustinpianalto/disgoman"
-
-func GetChannelName(ctx disgoman.Context, id string) string {
-	channel, err := ctx.Session.Channel(id)
-	if err != nil {
-		return ""
-	}
-	return channel.Name
-}
--- a/internal/discord_utils/checks.go
+++ b/internal/discord_utils/checks.go
@ -1,49 +0,0 @@
-package discord_utils
-
-import (
-	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
-)
-
-func IsGuildMod(ctx disgoman.Context, user geeksbot.User) bool {
-	discordCloser, err := ctx.Session.GuildMember(ctx.Guild.ID, user.ID)
-	if err != nil {
-		return false
-	}
-	guildRoles, err := services.GuildService.GuildRoles(geeksbot.Guild{ID: ctx.Guild.ID})
-	if err != nil {
-		return false
-	}
-	for _, role := range guildRoles {
-		if role.RoleType == "moderator" {
-			for _, rID := range discordCloser.Roles {
-				if rID == role.ID {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}
-
-func IsGuildAdmin(ctx disgoman.Context, user geeksbot.User) bool {
-	discordCloser, err := ctx.Session.GuildMember(ctx.Guild.ID, user.ID)
-	if err != nil {
-		return false
-	}
-	guildRoles, err := services.GuildService.GuildRoles(geeksbot.Guild{ID: ctx.Guild.ID})
-	if err != nil {
-		return false
-	}
-	for _, role := range guildRoles {
-		if role.RoleType == "admin" {
-			for _, rID := range discordCloser.Roles {
-				if rID == role.ID {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}
--- a/internal/discord_utils/errors.go
+++ b/internal/discord_utils/errors.go
@ -1,11 +0,0 @@
-package discord_utils
-
-import "github.com/dustinpianalto/disgoman"
-
-func SendErrorMessage(ctx disgoman.Context, msg string, err error) {
-	ctx.CommandManager.ErrorChannel <- disgoman.CommandError{
-		Context: ctx,
-		Message: msg,
-		Error:   err,
-	}
-}
--- a/internal/discord_utils/user_utils.go
+++ b/internal/discord_utils/user_utils.go
@ -1,14 +0,0 @@
-package discord_utils
-
-import "github.com/dustinpianalto/disgoman"
-
-func GetDisplayName(ctx disgoman.Context, id string) string {
-	member, err := ctx.Session.GuildMember(ctx.Guild.ID, id)
-	if err != nil {
-		return ""
-	}
-	if member.Nick != "" {
-		return member.Nick
-	}
-	return member.User.Username
-}
--- a/internal/exts/arcon/arcon.go
+++ b/internal/exts/arcon/arcon.go
@ -1,184 +0,0 @@
-package arcon
-
-import (
-	"fmt"
-	"log"
-	"strings"
-
-	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
-	"github.com/gorcon/rcon"
-)
-
-var ListplayersCommand = &disgoman.Command{
-	Name:                "listplayers",
-	Aliases:             nil,
-	Description:         "List the players currently connected to a ARK server.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              listplayersCommandFunc,
-}
-
-func listplayersCommandFunc(ctx disgoman.Context, args []string) {
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Sorry, there was a problem getting your user.", err)
-		return
-	}
-	if !discord_utils.IsGuildAdmin(ctx, author) && !discord_utils.IsGuildMod(ctx, author) {
-		return
-	}
-	if len(args) == 0 {
-		servers, err := services.ServerService.GuildServers(guild)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, "Could not find any servers for this guild", err)
-			return
-		}
-		for _, server := range servers {
-			go listplayers(ctx, server)
-		}
-		return
-	}
-	serverName := strings.Join(args, " ")
-	server, err := services.ServerService.ServerByName(serverName, guild)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx,
-			fmt.Sprintf("Could not find **%s** in this guild.", serverName),
-			err,
-		)
-		return
-	}
-	listplayers(ctx, server)
-}
-
-func listplayers(ctx disgoman.Context, server geeksbot.Server) {
-	msg, err := ctx.Send(fmt.Sprintf("**Getting data for %s**", server.Name))
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "There was an error getting the player list", err)
-		return
-	}
-	conn, err := rcon.Dial(fmt.Sprintf("%s:%d", server.IPAddr, server.Port), server.Password)
-	if err != nil {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**Could not open connection to %s**", server.Name),
-		)
-		return
-	}
-	defer conn.Close()
-	response, err := conn.Execute("listplayers")
-	if err != nil {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**There was a problem getting a response from %s**", server.Name),
-		)
-		return
-	}
-	if strings.HasPrefix(response, "No Players") {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**%s: %s**", server.Name, response),
-		)
-		return
-	}
-	players := strings.Split(response, "\n")
-	for i, player := range players {
-		parts := strings.Split(player, ", ")
-		steamID := parts[len(parts)-1]
-		user, err := services.UserService.GetBySteamID(steamID)
-		if err == nil {
-			duser, err := ctx.Session.GuildMember(ctx.Guild.ID, user.ID)
-			if err == nil {
-				players[i] = fmt.Sprintf("%s (%s)", player, duser.Mention())
-			}
-		}
-	}
-	_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-		fmt.Sprintf("**%s:**%s", server.Name, strings.Join(players, "\n")),
-	)
-}
-
-var BroadcastCommand = &disgoman.Command{
-	Name:                "broadcast",
-	Aliases:             nil,
-	Description:         "Broadcast a message to ARK servers.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              broadcastCommandFunc,
-}
-
-func broadcastCommandFunc(ctx disgoman.Context, args []string) {
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Sorry, there was a problem getting your user.", err)
-		return
-	}
-	if !discord_utils.IsGuildAdmin(ctx, author) && !discord_utils.IsGuildMod(ctx, author) {
-		return
-	}
-	message := strings.Join(args[1:len(args)], " ")
-	if strings.ToLower(args[0]) == "all" {
-		servers, err := services.ServerService.GuildServers(guild)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, "Could not find any servers for this guild", err)
-			return
-		}
-		for _, server := range servers {
-			go broadcast(ctx, server, message)
-		}
-		return
-	} else {
-		serverName := strings.Title(strings.ReplaceAll(args[0], "_", " "))
-		server, err := services.ServerService.ServerByName(serverName, guild)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, fmt.Sprintf("Could not find %s", serverName), err)
-			return
-		}
-		broadcast(ctx, server, message)
-	}
-}
-
-func broadcast(ctx disgoman.Context, server geeksbot.Server, message string) {
-	msg, err := ctx.Send(fmt.Sprintf("**Broadcasting to: %s**", server.Name))
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "There was an error getting the player list", err)
-		return
-	}
-	conn, err := rcon.Dial(fmt.Sprintf("%s:%d", server.IPAddr, server.Port), server.Password)
-	if err != nil {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**Could not open connection to %s**", server.Name),
-		)
-		return
-	}
-	defer conn.Close()
-	userName := discord_utils.GetDisplayName(ctx, ctx.Message.Author.ID)
-	response, err := conn.Execute(fmt.Sprintf("broadcast %s: %s", userName, message))
-	if err != nil {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**There was a problem getting a response from %s**", server.Name),
-		)
-		return
-	}
-	log.Printf("%T - %#v", response, response)
-	if strings.Contains(response, "Server received, But no response!!") {
-		_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-			fmt.Sprintf("**%s Broadcast Successful**", server.Name),
-		)
-		return
-	}
-	_, _ = ctx.Session.ChannelMessageEdit(ctx.Channel.ID, msg.ID,
-		fmt.Sprintf("**Broadcasting to %s Failed!**", server.Name),
-	)
-}
--- a/internal/exts/guild/guild.go
+++ b/internal/exts/guild/guild.go
@ -1,109 +0,0 @@
-package guild
-
-import (
-	"fmt"
-
-	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
-	"github.com/dustinpianalto/geeksbot/internal/utils"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
-)
-
-var AddPrefixCommand = &disgoman.Command{
-	Name:                "addPrefix",
-	Aliases:             []string{"ap"},
-	Description:         "Add a prefix for use in this guild.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: disgoman.PermissionManageServer,
-	Invoke:              addPrefixCommandFunc,
-}
-
-func addPrefixCommandFunc(ctx disgoman.Context, args []string) {
-	if len(args) == 0 {
-		discord_utils.SendErrorMessage(ctx, "Please include at least one prefix to add", nil)
-		return
-	}
-	guild, err := services.GuildService.Guild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Guild not configured, adding new guild to the database", nil)
-		guild = geeksbot.Guild{
-			ID:       ctx.Guild.ID,
-			Prefixes: args,
-		}
-		guild, err = services.GuildService.CreateGuild(guild)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, "Error adding guild to database.", err)
-			return
-		}
-	} else {
-		guild.Prefixes = append(guild.Prefixes, args...)
-		guild.Prefixes = utils.RemoveDuplicateStrings(guild.Prefixes)
-		guild, err = services.GuildService.UpdateGuild(guild)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, "Error adding prefixes to guild.", err)
-			return
-		}
-	}
-	_, err = ctx.Send(fmt.Sprintf("Prefixes Updates.\nThe Prefixes for this guild are currently %#v", guild.Prefixes))
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error sending update message", err)
-	}
-}
-
-var RemovePrefixCommand = &disgoman.Command{
-	Name:                "removePrefix",
-	Aliases:             []string{"rp"},
-	Description:         "Remove a prefix so it can't be used in this guild",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: disgoman.PermissionManageServer,
-	Invoke:              removePrefixCommandFunc,
-}
-
-func removePrefixCommandFunc(ctx disgoman.Context, args []string) {
-	if len(args) == 0 {
-		discord_utils.SendErrorMessage(ctx, "Please include at least one prefix to remove", nil)
-		return
-	}
-	guild, err := services.GuildService.Guild(ctx.Guild.ID)
-	var removed []string
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Guild not configured, adding new guild to the database", nil)
-		guild = geeksbot.Guild{
-			ID:       ctx.Guild.ID,
-			Prefixes: []string{},
-		}
-		guild, err = services.GuildService.CreateGuild(guild)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, "Error adding guild to database.", err)
-			return
-		}
-	} else {
-		for _, a := range args {
-			l := len(guild.Prefixes)
-			for i := 0; i < l; i++ {
-				if a == guild.Prefixes[i] {
-					guild.Prefixes = append(guild.Prefixes[:i], guild.Prefixes[i+1:]...)
-					l--
-					i--
-					removed = append(removed, a)
-				}
-			}
-		}
-		removed = utils.RemoveDuplicateStrings(removed)
-		guild.Prefixes = utils.RemoveDuplicateStrings(guild.Prefixes)
-		guild, err = services.GuildService.UpdateGuild(guild)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, "Error removing prefixes from guild.", err)
-			return
-		}
-	}
-	_, err = ctx.Send(fmt.Sprintf("Prefixes Updates.\n"+
-		"The Prefixes for this guild are currently %#v\n"+
-		"Removed: %#v", guild.Prefixes, removed))
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error sending update message", err)
-	}
-}
--- a/internal/exts/guild/roles.go
+++ b/internal/exts/guild/roles.go
@ -1,404 +0,0 @@
-package guild
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/bwmarrin/discordgo"
-	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
-	"github.com/dustinpianalto/geeksbot/internal/utils"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
-)
-
-var AddModeratorRoleCommand = &disgoman.Command{
-	Name:                "addMod",
-	Aliases:             []string{"addModerator", "addModRole"},
-	Description:         "Add a role which is allowed to run moderator commands",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: disgoman.PermissionManageServer,
-	Invoke:              addModeratorRoleCommandFunc,
-}
-
-func addModeratorRoleCommandFunc(ctx disgoman.Context, args []string) {
-	var count int
-	added := make(map[string]bool)
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Something went wrong getting the guild", err)
-		return
-	}
-	roles := append(args, ctx.Message.MentionRoles...)
-	if len(roles) > 0 {
-		for _, id := range roles {
-			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
-				continue
-			}
-			if _, ok := added[id]; ok {
-				continue
-			}
-			if _, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil {
-				_, _ = ctx.Send(fmt.Sprintf("%s does not reference a valid role for this guild.", id))
-				continue
-			}
-			_, err := services.GuildService.CreateOrUpdateRole(geeksbot.Role{
-				ID:       id,
-				RoleType: "moderator",
-				Guild:    guild,
-			})
-			if err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("There was a problem adding <@&%s>", id), err)
-				continue
-			}
-			added[id] = true
-			count++
-			_, _ = ctx.Send(fmt.Sprintf("Added <@&%s> as a moderator role.", id))
-		}
-		_, _ = ctx.Send(fmt.Sprintf("Added %d moderator %s.", count, utils.PluralizeString("role", count)))
-	} else {
-		_, _ = ctx.Send("Please include at least one role to make a moderator role.")
-	}
-}
-
-var AddAdminRoleCommand = &disgoman.Command{
-	Name:                "addAdmin",
-	Aliases:             []string{"addAdminRole"},
-	Description:         "Add a role which is allowed to run admin commands",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: disgoman.PermissionManageServer,
-	Invoke:              addAdminRoleCommandFunc,
-}
-
-func addAdminRoleCommandFunc(ctx disgoman.Context, args []string) {
-	var count int
-	added := make(map[string]bool)
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Something went wrong getting the guild", err)
-		return
-	}
-	roles := append(args, ctx.Message.MentionRoles...)
-	if len(roles) > 0 {
-		for _, id := range roles {
-			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
-				continue
-			}
-			if _, ok := added[id]; ok {
-				continue
-			}
-			if _, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil {
-				_, _ = ctx.Send(fmt.Sprintf("%s does not reference a valid role for this guild.", id))
-				continue
-			}
-			_, err := services.GuildService.CreateOrUpdateRole(geeksbot.Role{
-				ID:       id,
-				RoleType: "admin",
-				Guild:    guild,
-			})
-			if err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("There was a problem adding <@&%s>", id), err)
-				continue
-			}
-			added[id] = true
-			count++
-			_, _ = ctx.Send(fmt.Sprintf("Added <@&%s> as an admin role.", id))
-		}
-		_, _ = ctx.Send(fmt.Sprintf("Added %d admin %s.", count, utils.PluralizeString("role", count)))
-	} else {
-		_, _ = ctx.Send("Please include at least one role to make an admin role.")
-	}
-}
-
-var RemoveModRoleCommand = &disgoman.Command{
-	Name:                "removeMod",
-	Aliases:             []string{"removeModeratorRole", "removeModRole", "removeAdmin", "removeAdminRole"},
-	Description:         "Remove a role or several roles from the moderator or admin list",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: disgoman.PermissionManageServer,
-	Invoke:              removeModRoleCommandFunc,
-}
-
-func removeModRoleCommandFunc(ctx disgoman.Context, args []string) {
-	var count int
-	added := make(map[string]bool)
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Something went wrong getting the guild", err)
-		return
-	}
-	roles := append(args, ctx.Message.MentionRoles...)
-	if len(roles) > 0 {
-		for _, id := range roles {
-			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
-				continue
-			}
-			if _, ok := added[id]; ok {
-				continue
-			}
-			if _, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil {
-				if r, err := services.GuildService.Role(id); err != nil {
-					_, _ = ctx.Send(fmt.Sprintf("%s does not reference a valid role for this guild.", id))
-					continue
-				} else {
-					err = services.GuildService.DeleteRole(r)
-					if err != nil {
-						discord_utils.SendErrorMessage(ctx, "Something went wrong deleting the role", err)
-					}
-					_, _ = ctx.Send(fmt.Sprintf("Deleted <@&%s> as a no longer a valid role.", id))
-					continue
-				}
-			}
-			_, err := services.GuildService.CreateOrUpdateRole(geeksbot.Role{
-				ID:       id,
-				RoleType: "normal",
-				Guild:    guild,
-			})
-			if err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("There was a problem updating <@&%s>", id), err)
-				continue
-			}
-			added[id] = true
-			count++
-			_, _ = ctx.Send(fmt.Sprintf("Set <@&%s> as a normal role.", id))
-		}
-		_, _ = ctx.Send(fmt.Sprintf("Set %d %s to normal.", count, utils.PluralizeString("role", count)))
-	} else {
-		_, _ = ctx.Send("Please include at least one role to remove from the moderator or admin lists.")
-	}
-}
-
-var MakeRoleSelfAssignableCommand = &disgoman.Command{
-	Name:                "make-role-self-assignable",
-	Aliases:             []string{"makesar", "addsar"},
-	Description:         "Makes the passed in role self assignable by anyone",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: disgoman.PermissionManageServer,
-	Invoke:              makeRoleSelfAssignableCommandFunc,
-}
-
-func makeRoleSelfAssignableCommandFunc(ctx disgoman.Context, args []string) {
-	added := make(map[string]bool)
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Something went wrong getting the guild", err)
-		return
-	}
-
-	roles := append(args, ctx.Message.MentionRoles...)
-	if len(roles) > 0 {
-		for _, id := range roles {
-			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
-				continue
-			}
-			if _, ok := added[id]; ok {
-				continue
-			}
-
-			var role *discordgo.Role
-			var err error
-			if role, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%s does not reference a valid role for this guild", id), err)
-				return
-			}
-
-			_, err = services.GuildService.CreateOrUpdateRole(geeksbot.Role{
-				ID:       role.ID,
-				RoleType: "sar",
-				Guild:    guild,
-			})
-			if err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("There was a problem updating <@&%s>", role.ID), err)
-				return
-			}
-			_, _ = ctx.Send(fmt.Sprintf("%s is now self assignable", role.Name))
-
-		}
-	} else {
-		_, _ = ctx.Send("Please include at least one role to make self assignable")
-	}
-
-}
-
-var RemoveSelfAssignableCommand = &disgoman.Command{
-	Name:                "remove-self-assignable-role",
-	Aliases:             []string{"removesar"},
-	Description:         "Makes a role that was previously self assignable not so",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: disgoman.PermissionManageServer,
-	Invoke:              removeSelfAssignableRoleCommandFunc,
-}
-
-func removeSelfAssignableRoleCommandFunc(ctx disgoman.Context, args []string) {
-	removed := make(map[string]bool)
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Something went wrong getting the guild", err)
-		return
-	}
-
-	roles := append(args, ctx.Message.MentionRoles...)
-	if len(roles) > 0 {
-		for _, id := range roles {
-			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
-				continue
-			}
-			if _, ok := removed[id]; ok {
-				continue
-			}
-
-			var err error
-			var role *discordgo.Role
-			if role, err = ctx.Session.State.Role(ctx.Guild.ID, id); err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%s does not reference a valid role for this guild", id), err)
-				return
-			}
-			_, err = services.GuildService.CreateOrUpdateRole(geeksbot.Role{
-				ID:       role.ID,
-				RoleType: "normal",
-				Guild:    guild,
-			})
-			if err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("There was a problem updating <@&%s>", role.ID), err)
-				return
-			}
-			_, _ = ctx.Send(fmt.Sprintf("%s's self assignability has been removed.", role.Name))
-		}
-	} else {
-		_, _ = ctx.Send("Please include at least one role to make self assignable")
-	}
-
-}
-
-var SelfAssignRoleCommand = &disgoman.Command{
-	Name:                "giverole",
-	Aliases:             []string{"iwant", "givetome", "addrole"},
-	Description:         "Assigns a person the passed in role if it is self assignable",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              selfAssignRoleCommandFunc,
-}
-
-func selfAssignRoleCommandFunc(ctx disgoman.Context, args []string) {
-	added := make(map[string]bool)
-	roles := append(args, ctx.Message.MentionRoles...)
-	if len(roles) > 0 {
-		for _, id := range roles {
-			var roleID string
-			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
-				continue
-			} else if _, err := strconv.Atoi(id); err == nil {
-				roleID = id
-			} else {
-				for _, role := range ctx.Guild.Roles {
-					if strings.ToLower(id) == strings.ToLower(role.Name) {
-						roleID = role.ID
-					}
-				}
-			}
-
-			if _, ok := added[id]; ok {
-				continue
-			}
-			var role *discordgo.Role
-			var err error
-			if role, err = ctx.Session.State.Role(ctx.Guild.ID, roleID); err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%s does not reference a valid role for this guild", roleID), err)
-				return
-			}
-			if memberHasRole(ctx.Member, role.ID) {
-				_, _ = ctx.Send(fmt.Sprintf("You already have the %s role silly...", role.Name))
-				return
-			}
-			r, err := services.GuildService.Role(role.ID)
-			if err != nil || r.RoleType != "sar" {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("You aren't allowed to assign yourself the %s role", role.Name), err)
-				return
-			}
-			err = ctx.Session.GuildMemberRoleAdd(ctx.Guild.ID, ctx.User.ID, role.ID)
-			if err != nil {
-				discord_utils.SendErrorMessage(ctx, "There was a problem adding that role to you.", err)
-				return
-			}
-			_, _ = ctx.Send(fmt.Sprintf("Congratulations! The %s role has been added to your... Ummm... Thing.", role.Name))
-		}
-	} else {
-		_, _ = ctx.Send("Please include at least one role to make self assignable")
-	}
-
-}
-
-var UnAssignRoleCommand = &disgoman.Command{
-	Name:                "removerole",
-	Aliases:             []string{"idon'twant"},
-	Description:         "Removes a role from a person if the role is self assignable",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              unAssignRoleCommandFunc,
-}
-
-func unAssignRoleCommandFunc(ctx disgoman.Context, args []string) {
-	removed := make(map[string]bool)
-	roles := append(args, ctx.Message.MentionRoles...)
-	if len(roles) > 0 {
-		for _, id := range roles {
-			var roleID string
-			if strings.HasPrefix(id, "<@&") && strings.HasSuffix(id, ">") {
-				continue
-			} else if _, err := strconv.Atoi(id); err == nil {
-				roleID = id
-			} else {
-				for _, role := range ctx.Guild.Roles {
-					if strings.ToLower(id) == strings.ToLower(role.Name) {
-						roleID = role.ID
-					}
-				}
-			}
-			if _, ok := removed[id]; ok {
-				continue
-			}
-
-			var role *discordgo.Role
-			var err error
-			if role, err = ctx.Session.State.Role(ctx.Guild.ID, roleID); err != nil {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%s does not reference a valid role for this guild", roleID), err)
-				return
-			}
-			if !memberHasRole(ctx.Member, role.ID) {
-				_, _ = ctx.Send(fmt.Sprintf("I can't remove the %s role from you because you don't have it...", role.Name))
-				return
-			}
-			r, err := services.GuildService.Role(role.ID)
-			if err != nil || r.RoleType != "sar" {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("You aren't allowed to assign yourself the %s role", role.Name), err)
-				return
-			}
-			err = ctx.Session.GuildMemberRoleRemove(ctx.Guild.ID, ctx.User.ID, role.ID)
-			if err != nil {
-				discord_utils.SendErrorMessage(ctx, "There was a problem removing that role from your account", err)
-				return
-			}
-			_, _ = ctx.Send(fmt.Sprintf("Sad to see you go... but the %s role has been removed.", role.Name))
-		}
-	} else {
-		_, _ = ctx.Send("Please include at least one role to make self assignable")
-	}
-
-}
-
-func memberHasRole(m *discordgo.Member, id string) bool {
-	for _, r := range m.Roles {
-		if r == id {
-			return true
-		}
-	}
-	return false
-}
--- a/internal/exts/init.go
+++ b/internal/exts/init.go
@ -2,13 +2,10 @@ package exts

 import (
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/geeksbot/internal/exts/arcon"
-	"github.com/dustinpianalto/geeksbot/internal/exts/guild"
-	"github.com/dustinpianalto/geeksbot/internal/exts/requests"
 	"github.com/dustinpianalto/geeksbot/internal/exts/utils"
 )

-func AddCommandHandlers(g *disgoman.CommandManager) {
+func AddCommandHandlers(h *disgoman.CommandManager) {
 	// Arguments:
 	// name - command name - string
 	// desc - command description - string
@ -17,26 +14,9 @@ func AddCommandHandlers(g *disgoman.CommandManager) {
 	// perms - permissisions required - anpan.Permission (int)
 	// type - command type, sets where the command is available
 	// run - function to run - func(anpan.Context, []string) / CommandRunFunc
-	_ = g.AddCommand(utils.UserCommand)
-	_ = g.AddCommand(utils.AddUserCommand)
-	_ = g.AddCommand(utils.SayCommand)
-	_ = g.AddCommand(utils.GitCommand)
-	_ = g.AddCommand(utils.InviteCommand)
-	_ = g.AddCommand(utils.PingCommand)
-	_ = g.AddCommand(guild.AddPrefixCommand)
-	_ = g.AddCommand(guild.RemovePrefixCommand)
-	_ = g.AddCommand(guild.AddModeratorRoleCommand)
-	_ = g.AddCommand(guild.AddAdminRoleCommand)
-	_ = g.AddCommand(guild.RemoveModRoleCommand)
-	_ = g.AddCommand(guild.MakeRoleSelfAssignableCommand)
-	_ = g.AddCommand(guild.RemoveSelfAssignableCommand)
-	_ = g.AddCommand(guild.SelfAssignRoleCommand)
-	_ = g.AddCommand(guild.UnAssignRoleCommand)
-	_ = g.AddCommand(requests.RequestCommand)
-	_ = g.AddCommand(requests.CloseCommand)
-	_ = g.AddCommand(requests.ListCommand)
-	_ = g.AddCommand(requests.ViewCommand)
-	_ = g.AddCommand(requests.CommentCommand)
-	_ = g.AddCommand(arcon.ListplayersCommand)
-	_ = g.AddCommand(arcon.BroadcastCommand)
+	_ = h.AddCommand(utils.UserCommand)
+	_ = h.AddCommand(utils.SayCommand)
+	_ = h.AddCommand(utils.GitCommand)
+	_ = h.AddCommand(utils.InviteCommand)
+	_ = h.AddCommand(utils.PingCommand)
 }
--- a/internal/exts/requests/requests.go
+++ b/internal/exts/requests/requests.go
@ -1,449 +0,0 @@
-package requests
-
-import (
-	"fmt"
-	"log"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
-	"github.com/dustinpianalto/geeksbot/internal/utils"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
-)
-
-var RequestCommand = &disgoman.Command{
-	Name:                "request",
-	Aliases:             nil,
-	Description:         "Submit a request for the guild staff",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              requestCommandFunc,
-}
-
-func requestCommandFunc(ctx disgoman.Context, args []string) {
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	requestMsg := strings.Join(args, " ")
-	author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error creating the request. Could not get user.", err)
-		return
-	}
-	channel, err := services.ChannelService.GetOrCreateChannel(ctx.Message.ChannelID, ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error creating the request. Could not get channel.", err)
-		return
-	}
-	int64ID, _ := strconv.ParseInt(ctx.Message.ID, 10, 64)
-	s := discord_utils.ParseSnowflake(int64ID)
-	message, err := services.MessageService.CreateMessage(geeksbot.Message{
-		ID:        ctx.Message.ID,
-		CreatedAt: s.CreationTime,
-		Content:   ctx.Message.Content,
-		Channel:   channel,
-		Author:    author,
-	})
-	request := geeksbot.Request{
-		Author:      author,
-		Channel:     channel,
-		Guild:       guild,
-		Content:     requestMsg,
-		RequestedAt: s.CreationTime,
-		Completed:   false,
-		Message:     message,
-	}
-	request, err = services.RequestService.CreateRequest(request)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error creating the request", err)
-		return
-	}
-	channels, err := services.ChannelService.GuildChannels(guild)
-	if err == nil {
-		var mentionRolesString string
-		roles, err := services.GuildService.GuildRoles(guild)
-		if err == nil {
-			for _, r := range roles {
-				if r.RoleType == "admin" || r.RoleType == "moderator" {
-					mentionRolesString += fmt.Sprintf("<@&%s> ", r.ID)
-				}
-			}
-		}
-		for _, c := range channels {
-			if c.Admin {
-				_, _ = ctx.Session.ChannelMessageSend(c.ID,
-					fmt.Sprintf("%s\n"+
-						"New Request ID %d\n"+
-						"%s has requested assistance: \n"+
-						"```\n%s\n```\n"+
-						"Requested At: %s\n"+
-						"In: %s",
-						mentionRolesString,
-						request.ID,
-						ctx.Message.Author.Mention(),
-						request.Content,
-						request.RequestedAt.UTC().Format(time.UnixDate),
-						ctx.Channel.Mention(),
-					),
-				)
-			}
-		}
-	}
-	_, err = ctx.Send(fmt.Sprintf("%s The admin have recieved your request.\n "+
-		"If you would like to close or add a comment to this request please reference ID `%v`",
-		ctx.Message.Author.Mention(), request.ID,
-	))
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "There was an error sending the message. The request was created.", err)
-	}
-}
-
-var CloseCommand = &disgoman.Command{
-	Name:                "close",
-	Aliases:             nil,
-	Description:         "Close a request and mark it as completed.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              closeCommandFunc,
-}
-
-func closeCommandFunc(ctx disgoman.Context, args []string) {
-	var ids []int64
-	var reason string
-	_, err := strconv.ParseInt(args[len(args)-1], 10, 64)
-	if err != nil {
-		reason = args[len(args)-1]
-		args = args[0 : len(args)-1]
-	}
-	for _, a := range args {
-		a = strings.Trim(a, ",")
-		id, err := strconv.ParseInt(a, 10, 64)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%s is not a valid request id", a), err)
-			continue
-		}
-		ids = append(ids, id)
-	}
-	if len(ids) == 0 {
-		discord_utils.SendErrorMessage(ctx, "No requests to close", nil)
-		return
-	}
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	closer, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error closing the request. Could not get user.", err)
-		return
-	}
-	int64ID, _ := strconv.ParseInt(ctx.Message.ID, 10, 64)
-	s := discord_utils.ParseSnowflake(int64ID)
-	for _, id := range ids {
-		request, err := services.RequestService.Request(id)
-		if err != nil || request.Guild.ID != guild.ID {
-			discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%d is not a request in this guild.", id), err)
-			continue
-		}
-		if request.Author != closer && !closer.IsStaff && !closer.IsAdmin {
-			if !discord_utils.IsGuildMod(ctx, closer) && !discord_utils.IsGuildAdmin(ctx, closer) {
-				discord_utils.SendErrorMessage(ctx, fmt.Sprintf("You are not authorized to close %d", id), nil)
-				continue
-			}
-		}
-		if request.Completed {
-			discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%d is already closed", id), err)
-			continue
-		}
-		request.Completed = true
-		request.CompletedAt.Valid = true
-		request.CompletedAt.Time = s.CreationTime
-		request.CompletedBy = &closer
-		if reason != "" {
-			request.CompletedMessage.Valid = true
-			request.CompletedMessage.String = reason
-		}
-		request, err = services.RequestService.UpdateRequest(request)
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, fmt.Sprintf("Error closing %d", id), err)
-			continue
-		}
-		_, err = ctx.Send(fmt.Sprintf("%d has been closed", request.ID))
-		if err != nil {
-			discord_utils.SendErrorMessage(ctx, "There was an error sending the message. The request was closed.", err)
-		}
-		dmChannel, err := ctx.Session.UserChannelCreate(request.Author.ID)
-		if err != nil {
-			return
-		}
-		_, _ = ctx.Session.ChannelMessageSend(dmChannel.ID,
-			fmt.Sprintf("%s has closed request %d which you opened in the %s channel.\n```%s```\n",
-				discord_utils.GetDisplayName(ctx, request.CompletedBy.ID),
-				request.ID,
-				discord_utils.GetChannelName(ctx, request.Channel.ID),
-				request.Content,
-			))
-	}
-}
-
-var ListCommand = &disgoman.Command{
-	Name:                "list",
-	Aliases:             []string{"request_list", "requests_list"},
-	Description:         "List your open requests or all open requests if the caller is a moderator",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              listCommandFunc,
-}
-
-func listCommandFunc(ctx disgoman.Context, args []string) {
-	user, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error closing the request. Could not get user.", err)
-		return
-	}
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-
-	var requests []geeksbot.Request
-	if discord_utils.IsGuildMod(ctx, user) || discord_utils.IsGuildAdmin(ctx, user) {
-		requests, err = services.RequestService.GuildRequests(guild, false)
-	} else {
-		requests, err = services.RequestService.UserRequests(user, false)
-	}
-
-	for _, request := range requests {
-		var authorName string
-		author, err := ctx.Session.GuildMember(guild.ID, request.Author.ID)
-		if err != nil {
-			authorName = "Unknown"
-		} else {
-			if author.Nick == "" {
-				authorName = author.User.Username
-			} else {
-				authorName = author.Nick
-			}
-		}
-
-		var channelName string
-		channel, err := ctx.Session.Channel(request.Channel.ID)
-		if err != nil {
-			channelName = "Unknown"
-		} else {
-			channelName = channel.Name
-		}
-		commentCount, err := services.RequestService.RequestCommentCount(request)
-		if err != nil {
-			commentCount = 0
-		}
-		_, _ = ctx.Send(fmt.Sprintf("```md\n"+
-			"< Request ID             Requested By >\n"+
-			"< %-11d %23s >\n"+
-			"%s\n\n"+
-			"Comments: %d\n"+
-			"Requested At: %s\n"+
-			"In: %s\n"+
-			"```",
-			request.ID,
-			authorName,
-			request.Content,
-			commentCount,
-			request.RequestedAt.Format("2006-01-02 15:04:05 MST"),
-			channelName,
-		))
-	}
-
-	_, _ = ctx.Send(fmt.Sprintf("```There %s currently %d open %s```", utils.PluralizeString("is", len(requests)), len(requests), utils.PluralizeString("request", len(requests))))
-}
-
-var CommentCommand = &disgoman.Command{
-	Name:                "comment",
-	Aliases:             []string{"update", "add_comment"},
-	Description:         "Add a comment to an existing request.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              commentCommandFunc,
-}
-
-func commentCommandFunc(ctx disgoman.Context, args []string) {
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	id, err := strconv.ParseInt(args[0], 10, 64)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Please include the ID of the request to update.", err)
-		return
-	}
-	message := strings.Join(args[1:len(args)], " ")
-	author, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Sorry, there was an issue finding your user account", err)
-		return
-	}
-	request, err := services.RequestService.Request(id)
-	if err != nil || request.Guild.ID != guild.ID {
-		discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%d is not a valid request for this guild", id), err)
-		return
-	}
-	int64ID, _ := strconv.ParseInt(ctx.Message.ID, 10, 64)
-	s := discord_utils.ParseSnowflake(int64ID)
-	comment := geeksbot.Comment{
-		Author:    author,
-		Request:   request,
-		CommentAt: s.CreationTime,
-		Content:   message,
-	}
-	comment, err = services.RequestService.CreateComment(comment)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "There was a problem adding your comment", err)
-		return
-	}
-	channels, err := services.ChannelService.GuildChannels(guild)
-	if err == nil {
-		comments, _ := services.RequestService.RequestComments(request)
-		var commentString string
-		var commentStrings []string
-		commentString = fmt.Sprintf("Comment added:\n```md\n"+
-			"< Request ID             Requested By >\n"+
-			"< %-11d %23s >\n"+
-			"%s\n\n"+
-			"Comments: Not Implemented Yet\n"+
-			"Requested At: %s\n"+
-			"In: %s\n"+
-			"```",
-			request.ID,
-			discord_utils.GetDisplayName(ctx, request.Author.ID),
-			request.Content,
-			request.RequestedAt.Format("2006-01-02 15:04:05"),
-			discord_utils.GetChannelName(ctx, request.Channel.ID),
-		)
-		for _, c := range comments {
-			if err != nil {
-				log.Println(err)
-				continue
-			}
-			cs := fmt.Sprintf("```md\n%s\n- %s At %s\n```\n",
-				c.Content,
-				discord_utils.GetDisplayName(ctx, c.Author.ID),
-				c.CommentAt.Format("2006-01-02 15:04:05"),
-			)
-			if len(commentString+cs) >= 2000 {
-				commentStrings = append(commentStrings, commentString)
-				commentString = ""
-			}
-			commentString += cs
-		}
-		commentStrings = append(commentStrings, commentString)
-		for _, c := range channels {
-			if c.Admin {
-				for _, s := range commentStrings {
-					_, _ = ctx.Session.ChannelMessageSend(c.ID, s)
-				}
-			}
-		}
-	} else {
-		log.Println(err)
-	}
-	_, err = ctx.Send(fmt.Sprintf("%s your comment has been added.", ctx.Message.Author.Mention()))
-	dmChannel, err := ctx.Session.UserChannelCreate(request.Author.ID)
-	if err != nil {
-		return
-	}
-	_, _ = ctx.Session.ChannelMessageSend(dmChannel.ID,
-		fmt.Sprintf("%s has add a comment to request %d which you opened in the %s channel.\n```%s```\n```%s```",
-			discord_utils.GetDisplayName(ctx, author.ID),
-			request.ID,
-			discord_utils.GetChannelName(ctx, ctx.Channel.ID),
-			request.Content,
-			message,
-		))
-
-}
-
-var ViewCommand = &disgoman.Command{
-	Name:                "view",
-	Aliases:             nil,
-	Description:         "View the details about a request.",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              viewCommandFunc,
-}
-
-func viewCommandFunc(ctx disgoman.Context, args []string) {
-	guild, err := services.GuildService.GetOrCreateGuild(ctx.Guild.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Error getting Guild from the database", err)
-		return
-	}
-	id, err := strconv.ParseInt(args[0], 10, 64)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Please include the ID of the request to view.", err)
-		return
-	}
-	request, err := services.RequestService.Request(id)
-	if err != nil || request.Guild.ID != guild.ID {
-		discord_utils.SendErrorMessage(ctx, fmt.Sprintf("%d is not a valid request in this guild", id), err)
-		return
-	}
-	requestor, err := services.UserService.GetOrCreateUser(ctx.Message.Author.ID)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "Sorry, there was an issue finding your user account", err)
-		return
-	}
-	if request.Author.ID != ctx.Message.Author.ID &&
-		!discord_utils.IsGuildMod(ctx, requestor) &&
-		!discord_utils.IsGuildAdmin(ctx, requestor) {
-		discord_utils.SendErrorMessage(ctx, "You are not authorized to view that request", nil)
-		return
-	}
-	comments, err := services.RequestService.RequestComments(request)
-	if err != nil {
-		discord_utils.SendErrorMessage(ctx, "There was an error getting the comments.", err)
-	}
-	var commentString string
-	var commentStrings []string
-	commentString = fmt.Sprintf("```md\n"+
-		"< Request ID             Requested By >\n"+
-		"< %-11d %23s >\n"+
-		"%s\n\n"+
-		"Requested At: %s\n"+
-		"In: %s\n"+
-		"```",
-		request.ID,
-		discord_utils.GetDisplayName(ctx, request.Author.ID),
-		request.Content,
-		request.RequestedAt.Format("2006-01-02 15:04:05"),
-		discord_utils.GetChannelName(ctx, request.Channel.ID),
-	)
-	for _, c := range comments {
-		cs := fmt.Sprintf("```md\n%s\n- %s At %s\n```\n",
-			c.Content,
-			discord_utils.GetDisplayName(ctx, c.Author.ID),
-			c.CommentAt.Format("2006-01-02 15:04:05"),
-		)
-		if len(commentString+cs) >= 2000 {
-			commentStrings = append(commentStrings, commentString)
-			commentString = ""
-		}
-		commentString += cs
-	}
-	commentStrings = append(commentStrings, commentString)
-	for _, c := range commentStrings {
-		_, _ = ctx.Send(c)
-	}
-}
--- a/internal/exts/utils/utils.go
+++ b/internal/exts/utils/utils.go
@ -9,9 +9,7 @@ import (

 	"github.com/bwmarrin/discordgo"
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/geeksbot"
 	"github.com/dustinpianalto/geeksbot/internal/discord_utils"
-	"github.com/dustinpianalto/geeksbot/pkg/services"
 )

 var PingCommand = &disgoman.Command{
@ -248,34 +246,3 @@ func userCommandFunc(ctx disgoman.Context, args []string) {
 		}
 	}
 }
-
-var AddUserCommand = &disgoman.Command{
-	Name:                "adduser",
-	Aliases:             nil,
-	Description:         "Get user info",
-	OwnerOnly:           false,
-	Hidden:              false,
-	RequiredPermissions: 0,
-	Invoke:              addUserCommandFunc,
-}
-
-func addUserCommandFunc(ctx disgoman.Context, args []string) {
-	if ctx.Message.Author.ID == ctx.CommandManager.Owners[0] {
-		user := geeksbot.User{
-			ID:       ctx.Message.Author.ID,
-			IsActive: true,
-			IsStaff:  true,
-			IsAdmin:  true,
-		}
-		user, err := services.UserService.CreateUser(user)
-		if err != nil {
-			ctx.CommandManager.ErrorChannel <- disgoman.CommandError{
-				Context: ctx,
-				Message: "Error with adding user",
-				Error:   err,
-			}
-			return
-		}
-		ctx.Session.MessageReactionAdd(ctx.Channel.ID, ctx.Message.ID, "✅")
-	}
-}
--- a/internal/utils/utils.go
+++ b/internal/utils/utils.go
@ -1,24 +0,0 @@
-package utils
-
-func RemoveDuplicateStrings(s []string) []string {
-	keys := make(map[string]bool)
-	o := []string{}
-
-	for _, e := range s {
-		if _, v := keys[e]; !v {
-			keys[e] = true
-			o = append(o, e)
-		}
-	}
-	return o
-}
-
-func PluralizeString(s string, i int) string {
-	if i == 1 {
-		return s
-	}
-	if s == "is" {
-		return "are"
-	}
-	return s + "s"
-}
--- a/message.go
+++ b/message.go
@ -1,24 +1,23 @@
 package geeksbot

-import (
-	"database/sql"
-	"time"
-)
+import "github.com/bwmarrin/discordgo"

 type Message struct {
 	ID              string
-	CreatedAt       time.Time
-	ModifiedAt      sql.NullTime
+	CreatedAt       int64
+	ModifiedAt      int64
 	Content         string
 	PreviousContent []string
-	Channel         Channel
-	Author          User
+	Channel         *Channel
+	Author          *User
+	Embed           *discordgo.MessageEmbed
+	PreviousEmbeds  []*discordgo.MessageEmbed
 }

 type MessageService interface {
-	Message(id string) (Message, error)
-	CreateMessage(m Message) (Message, error)
-	DeleteMessage(m Message) error
-	ChannelMessages(c Channel) ([]Message, error)
-	UpdateMessage(m Message) (Message, error)
+	Message(id string) (*Message, error)
+	CreateMessage(m *Message) (*Message, error)
+	DeleteMessage(m *Message) error
+	ChannelMessages(c *Channel) ([]*Message, error)
+	UpdateMessage(m *Message) (*Message, error)
 }
--- a/patreon.go
+++ b/patreon.go
@ -1,34 +1,31 @@
 package geeksbot

-import "database/sql"
-
 type PatreonCreator struct {
 	ID      int
 	Creator string
 	Link    string
-	Guild   Guild
+	Guild   *Guild
 }

 type PatreonTier struct {
 	ID          int
 	Name        string
-	Description sql.NullString
-	Creator     PatreonCreator
-	Role        Role
+	Description string
+	Creator     *PatreonCreator
+	Role        *Role
 	NextTier    *PatreonTier
 }

 type PatreonService interface {
-	PatreonCreatorByID(id int) (PatreonCreator, error)
-	PatreonCreatorByName(name string, guild Guild) (PatreonCreator, error)
-	CreatePatreonCreator(c PatreonCreator) (PatreonCreator, error)
-	UpdatePatreonCreator(c PatreonCreator) (PatreonCreator, error)
-	DeletePatreonCreator(c PatreonCreator) error
-	PatreonTierByID(id int) (PatreonTier, error)
-	PatreonTierByName(name string, creator string) (PatreonTier, error)
-	CreatePatreonTier(t PatreonTier) (PatreonTier, error)
-	UpdatePatreonTier(t PatreonTier) (PatreonTier, error)
-	DeletePatreonTier(t PatreonTier) error
-	GuildPatreonCreators(g Guild) ([]PatreonCreator, error)
-	CreatorPatreonTiers(c PatreonCreator) ([]PatreonTier, error)
+	PatreonCreatorByID(id int) (*PatreonCreator, error)
+	PatreonCreatorByName(name string) (*PatreonCreator, error)
+	CreatePatreonCreator(c *PatreonCreator) (*PatreonCreator, error)
+	UpdatePatreonCreator(c *PatreonCreator) (*PatreonCreator, error)
+	DeletePatreonCreator(c *PatreonCreator) error
+	PatreonTierByID(id int) (*PatreonTier, error)
+	PatreonTierByName(name string) (*PatreonTier, error)
+	CreatePatreonTier(t *PatreonTier) (*PatreonTier, error)
+	UpdatePatreonTier(t *PatreonTier) (*PatreonTier, error)
+	DeletePatreonTier(t *PatreonTier) error
+	GuildPatreonCreators(g *Guild) ([]*PatreonCreator, error)
 }
--- a/pkg/database/channel.go
+++ b/pkg/database/channel.go
@ -1,87 +0,0 @@
-package database
-
-import (
-	"database/sql"
-	"log"
-
-	"github.com/dustinpianalto/geeksbot"
-)
-
-type channelService struct {
-	db *sql.DB
-}
-
-func (s channelService) Channel(id string) (geeksbot.Channel, error) {
-	var channel geeksbot.Channel
-	var guild_id string
-	queryString := "SELECT id, guild_id, admin, default_channel, new_patron FROM channels WHERE id = $1"
-	row := s.db.QueryRow(queryString, id)
-	err := row.Scan(&channel.ID, &guild_id, &channel.Admin, &channel.Default, &channel.NewPatron)
-	if err != nil {
-		return geeksbot.Channel{}, err
-	}
-	guild, err := GuildService.Guild(guild_id)
-	if err != nil {
-		return geeksbot.Channel{}, err
-	}
-	channel.Guild = guild
-	return channel, nil
-}
-
-func (s channelService) CreateChannel(c geeksbot.Channel) (geeksbot.Channel, error) {
-	queryString := "INSERT INTO channels (id, guild_id, admin, default_channel, new_patron) VALUES ($1, $2, $3, $4, $5)"
-	_, err := s.db.Exec(queryString, c.ID, c.Guild.ID, c.Admin, c.Default, c.NewPatron)
-	return c, err
-}
-
-func (s channelService) DeleteChannel(c geeksbot.Channel) error {
-	queryString := "DELETE FROM channels WHERE id = $1"
-	_, err := s.db.Exec(queryString, c.ID)
-	return err
-}
-
-func (s channelService) UpdateChannel(c geeksbot.Channel) (geeksbot.Channel, error) {
-	queryString := "UPDATE channels SET admin = $2, default_channel = $3, new_patron = $4 WHERE id = $1"
-	_, err := s.db.Exec(queryString, c.ID, c.Admin, c.Default, c.NewPatron)
-	return c, err
-}
-
-func (s channelService) GuildChannels(g geeksbot.Guild) ([]geeksbot.Channel, error) {
-	var channels []geeksbot.Channel
-	queryString := "SELECT id FROM channels WHERE guild_id = $1"
-	rows, err := s.db.Query(queryString, g.ID)
-	for rows.Next() {
-		var id string
-		err = rows.Scan(&id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		channel, err := s.Channel(id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		channels = append(channels, channel)
-	}
-	return channels, nil
-}
-
-func (s channelService) GetOrCreateChannel(id string, guild_id string) (geeksbot.Channel, error) {
-	channel, err := s.Channel(id)
-	if err == sql.ErrNoRows {
-		var guild geeksbot.Guild
-		guild, err = GuildService.GetOrCreateGuild(guild_id)
-		if err != nil {
-			return geeksbot.Channel{}, err
-		}
-		channel, err = s.CreateChannel(geeksbot.Channel{
-			ID:        id,
-			Guild:     guild,
-			Admin:     false,
-			Default:   false,
-			NewPatron: false,
-		})
-	}
-	return channel, err
-}
--- a/pkg/database/guild.go
+++ b/pkg/database/guild.go
@ -1,121 +0,0 @@
-package database
-
-import (
-	"database/sql"
-	"log"
-
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/lib/pq"
-)
-
-type guildService struct {
-	db *sql.DB
-}
-
-func (s guildService) Guild(id string) (geeksbot.Guild, error) {
-	var g geeksbot.Guild
-	queryString := "SELECT id, new_patron_message, prefixes FROM guilds WHERE id = $1"
-	row := s.db.QueryRow(queryString, id)
-	err := row.Scan(&g.ID, &g.NewPatronMessage, pq.Array(&g.Prefixes))
-	if err != nil {
-		return geeksbot.Guild{}, err
-	}
-	return g, nil
-}
-
-func (s guildService) CreateGuild(g geeksbot.Guild) (geeksbot.Guild, error) {
-	queryString := "INSERT INTO guilds (id, new_patron_message, prefixes) VALUES ($1, $2, $3)"
-	_, err := s.db.Exec(queryString, g.ID, g.NewPatronMessage, pq.Array(g.Prefixes))
-	return g, err
-}
-
-func (s guildService) DeleteGuild(g geeksbot.Guild) error {
-	queryString := "DELETE FROM guilds WHERE id = $1"
-	_, err := s.db.Exec(queryString, g.ID)
-	return err
-}
-
-func (s guildService) UpdateGuild(g geeksbot.Guild) (geeksbot.Guild, error) {
-	queryString := "UPDATE guilds SET new_patron_message = $2, prefixes = $3 WHERE id = $1"
-	_, err := s.db.Exec(queryString, g.ID, g.NewPatronMessage, pq.Array(g.Prefixes))
-	return g, err
-}
-
-func (s guildService) GuildRoles(g geeksbot.Guild) ([]geeksbot.Role, error) {
-	var roles []geeksbot.Role
-	queryString := "SELECT id FROM roles WHERE guild_id = $1"
-	rows, err := s.db.Query(queryString, g.ID)
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		var id string
-		err = rows.Scan(&id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		role, err := s.Role(id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		roles = append(roles, role)
-	}
-	return roles, nil
-}
-
-func (s guildService) CreateRole(r geeksbot.Role) (geeksbot.Role, error) {
-	queryString := "INSERT INTO roles (id, role_type, guild_id) VALUES ($1, $2, $3)"
-	_, err := s.db.Exec(queryString, r.ID, r.RoleType, r.Guild.ID)
-	return r, err
-}
-
-func (s guildService) Role(id string) (geeksbot.Role, error) {
-	var role geeksbot.Role
-	var guild_id string
-	queryString := "SELECT id, role_type, guild_id FROM roles WHERE id = $1"
-	row := s.db.QueryRow(queryString, id)
-	err := row.Scan(&role.ID, &role.RoleType, &guild_id)
-	if err != nil {
-		return geeksbot.Role{}, err
-	}
-	guild, err := s.Guild(guild_id)
-	if err != nil {
-		return geeksbot.Role{}, err
-	}
-	role.Guild = guild
-	return role, nil
-}
-
-func (s guildService) UpdateRole(r geeksbot.Role) (geeksbot.Role, error) {
-	queryString := "UPDATE roles SET role_type = $2 WHERE id = $1"
-	_, err := s.db.Exec(queryString, r.ID, r.RoleType)
-	return r, err
-}
-
-func (s guildService) DeleteRole(r geeksbot.Role) error {
-	queryString := "DELETE FROM roles WHERE id = $1"
-	_, err := s.db.Exec(queryString, r.ID)
-	return err
-}
-
-func (s guildService) GetOrCreateGuild(id string) (geeksbot.Guild, error) {
-	guild, err := s.Guild(id)
-	if err == sql.ErrNoRows {
-		guild = geeksbot.Guild{
-			ID:       id,
-			Prefixes: []string{},
-		}
-		guild, err = s.CreateGuild(guild)
-	}
-	return guild, err
-}
-
-func (s guildService) CreateOrUpdateRole(r geeksbot.Role) (geeksbot.Role, error) {
-	role, err := s.CreateRole(r)
-	if err != nil && err.Error() == `pq: duplicate key value violates unique constraint "roles_pkey"` {
-		role, err = s.UpdateRole(r)
-	}
-	return role, err
-}
--- a/pkg/database/message.go
+++ b/pkg/database/message.go
@ -1,95 +0,0 @@
-package database
-
-import (
-	"database/sql"
-	"log"
-
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/lib/pq"
-)
-
-type messageService struct {
-	db *sql.DB
-}
-
-func (s messageService) Message(id string) (geeksbot.Message, error) {
-	var m geeksbot.Message
-	var channel_id string
-	var author_id string
-	queryString := `SELECT m.id, m.created_at, m.modified_at, m.content, 
-						m.previous_content, m.channel_id, m.author_id
-						FROM messages as m
-						WHERE m.id = $1`
-	row := s.db.QueryRow(queryString, id)
-	err := row.Scan(&m.ID, &m.CreatedAt, &m.ModifiedAt, &m.Content,
-		pq.Array(&m.PreviousContent), &channel_id, &author_id)
-	if err != nil {
-		return geeksbot.Message{}, err
-	}
-	author, err := UserService.User(author_id)
-	if err != nil {
-		return geeksbot.Message{}, err
-	}
-	m.Author = author
-	channel, err := ChannelService.Channel(channel_id)
-	if err != nil {
-		return geeksbot.Message{}, err
-	}
-	m.Channel = channel
-	return m, nil
-}
-
-func (s messageService) CreateMessage(m geeksbot.Message) (geeksbot.Message, error) {
-	queryString := `INSERT INTO messages (id, created_at, content, channel_id, author_id) 
-					VALUES ($1, $2, $3, $4, $5)`
-	_, err := s.db.Exec(queryString, m.ID, m.CreatedAt, m.Content, m.Channel.ID, m.Author.ID)
-	return m, err
-}
-
-func (s messageService) UpdateMessage(m geeksbot.Message) (geeksbot.Message, error) {
-	var content string
-	var previousContent []string
-	queryString := "SELECT content, previous_content FROM messages WHERE id = $1"
-	row := s.db.QueryRow(queryString, m.ID)
-	err := row.Scan(&content, &previousContent)
-	if err != nil {
-		return geeksbot.Message{}, err
-	}
-	if m.Content != content {
-		previousContent = append(previousContent, content)
-	}
-	queryString = "UPDATE messages SET modified_at = $2, content = $3, previous_content = $4 WHERE id = $1"
-	_, err = s.db.Exec(queryString, m.ID, m.ModifiedAt, m.Content, previousContent)
-	m.PreviousContent = previousContent
-	return m, nil
-}
-
-func (s messageService) DeleteMessage(m geeksbot.Message) error {
-	queryString := "DELETE FROM messages WHERE id = $1"
-	_, err := s.db.Exec(queryString, m.ID)
-	return err
-}
-
-func (s messageService) ChannelMessages(c geeksbot.Channel) ([]geeksbot.Message, error) {
-	var messages []geeksbot.Message
-	queryString := `SELECT id FROM messages WHERE channel_id = $1`
-	rows, err := s.db.Query(queryString, c.ID)
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		var id string
-		err = rows.Scan(&id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		m, err := s.Message(id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		messages = append(messages, m)
-	}
-	return messages, nil
-}
--- a/pkg/database/migrations/000002_add_guild_to_request.down.sql
+++ b/pkg/database/migrations/000002_add_guild_to_request.down.sql
@ -1 +0,0 @@
-ALTER TABLE requests DROP COLUMN guild_id;
--- a/pkg/database/migrations/000002_add_guild_to_request.up.sql
+++ b/pkg/database/migrations/000002_add_guild_to_request.up.sql
@ -1,2 +0,0 @@
-ALTER TABLE requests 
-    ADD COLUMN guild_id varchar(30) CONSTRAINT fk_guild REFERENCES guilds(id) ON DELETE CASCADE;
--- a/pkg/database/migrations/000003_set_column_not_null.down.sql
+++ b/pkg/database/migrations/000003_set_column_not_null.down.sql
@ -1,48 +0,0 @@
-BEGIN;
-    ALTER TABLE users
-        ALTER COLUMN active DROP NOT NULL,
-        ALTER COLUMN staff DROP NOT NULL,
-        ALTER COLUMN admin DROP NOT NULL;
-    ALTER TABLE channels
-        ALTER COLUMN guild_id DROP NOT NULL,
-        ALTER COLUMN admin DROP NOT NULL,
-        ALTER COLUMN default_channel DROP NOT NULL,
-        ALTER COLUMN new_patron DROP NOT NULL;
-    ALTER TABLE messages
-        ALTER COLUMN created_at DROP NOT NULL,
-        ALTER COLUMN content DROP NOT NULL,
-        ALTER COLUMN channel_id DROP NOT NULL,
-        ALTER COLUMN author_id DROP NOT NULL;
-    ALTER TABLE messages
-        ADD COLUMN embed json,
-        ADD COLUMN previous_embeds json[];
-    ALTER TABLE patreon_creators
-        ALTER COLUMN creator DROP NOT NULL,
-        ALTER COLUMN link DROP NOT NULL,
-        ALTER COLUMN guild_id DROP NOT NULL;
-    ALTER TABLE patreon_creators
-        RENAME TO patreon_creator;
-    ALTER TABLE patreon_tiers
-        ALTER COLUMN name DROP NOT NULL,
-        ALTER COLUMN creator DROP NOT NULL,
-        ALTER COLUMN role DROP NOT NULL;
-    ALTER TABLE patreon_tiers
-        RENAME TO patreon_tier;
-    ALTER TABLE requests
-        ALTER COLUMN author_id DROP NOT NULL,
-        ALTER COLUMN channel_id DROP NOT NULL,
-        ALTER COLUMN content DROP NOT NULL,
-        ALTER COLUMN requested_at DROP NOT NULL,
-        ALTER COLUMN completed DROP NOT NULL,
-        ALTER COLUMN message_id DROP NOT NULL,
-        ALTER COLUMN guild_id DROP NOT NULL;
-    ALTER TABLE roles
-        ALTER COLUMN role_type DROP NOT NULL,
-        ALTER COLUMN guild_id DROP NOT NULL;
-    ALTER TABLE servers
-        ALTER COLUMN name DROP NOT NULL,
-        ALTER COLUMN ip_address DROP NOT NULL,
-        ALTER COLUMN port DROP NOT NULL,
-        ALTER COLUMN password DROP NOT NULL,
-        ALTER COLUMN guild_id DROP NOT NULL;
-COMMIT;
--- a/pkg/database/migrations/000003_set_column_not_null.up.sql
+++ b/pkg/database/migrations/000003_set_column_not_null.up.sql
@ -1,48 +0,0 @@
-BEGIN;
-    ALTER TABLE users
-        ALTER COLUMN active SET NOT NULL,
-        ALTER COLUMN staff SET NOT NULL,
-        ALTER COLUMN admin SET NOT NULL;
-    ALTER TABLE channels
-        ALTER COLUMN guild_id SET NOT NULL,
-        ALTER COLUMN admin SET NOT NULL,
-        ALTER COLUMN default_channel SET NOT NULL,
-        ALTER COLUMN new_patron SET NOT NULL;
-    ALTER TABLE messages
-        ALTER COLUMN created_at SET NOT NULL,
-        ALTER COLUMN content SET NOT NULL,
-        ALTER COLUMN channel_id SET NOT NULL,
-        ALTER COLUMN author_id SET NOT NULL;
-    ALTER TABLE messages
-        DROP COLUMN embed,
-        DROP COLUMN previous_embeds;
-    ALTER TABLE patreon_creator
-        ALTER COLUMN creator SET NOT NULL,
-        ALTER COLUMN link SET NOT NULL,
-        ALTER COLUMN guild_id SET NOT NULL;
-    ALTER TABLE patreon_creator
-        RENAME TO patreon_creators;
-    ALTER TABLE patreon_tier
-        ALTER COLUMN name SET NOT NULL,
-        ALTER COLUMN creator SET NOT NULL,
-        ALTER COLUMN role SET NOT NULL;
-    ALTER TABLE patreon_tier
-        RENAME TO patreon_tiers;
-    ALTER TABLE requests
-        ALTER COLUMN author_id SET NOT NULL,
-        ALTER COLUMN channel_id SET NOT NULL,
-        ALTER COLUMN content SET NOT NULL,
-        ALTER COLUMN requested_at SET NOT NULL,
-        ALTER COLUMN completed SET NOT NULL,
-        ALTER COLUMN message_id SET NOT NULL,
-        ALTER COLUMN guild_id SET NOT NULL;
-    ALTER TABLE roles
-        ALTER COLUMN role_type SET NOT NULL,
-        ALTER COLUMN guild_id SET NOT NULL;
-    ALTER TABLE servers
-        ALTER COLUMN name SET NOT NULL,
-        ALTER COLUMN ip_address SET NOT NULL,
-        ALTER COLUMN port SET NOT NULL,
-        ALTER COLUMN password SET NOT NULL,
-        ALTER COLUMN guild_id SET NOT NULL;
-COMMIT;
--- a/pkg/database/migrations/000004_add_sar_role_type.down.sql
+++ b/pkg/database/migrations/000004_add_sar_role_type.down.sql
@ -1,14 +0,0 @@
-BEGIN;
-    CREATE TYPE role_type_new AS ENUM (
-        'normal',
-        'moderator',
-        'admin',
-        'patreon',
-    );
-    UPDATE roles SET role_type = 'normal' WHERE role_type = 'sar';
-    ALTER TABLE roles 
-        ALTER COLUMN roles TYPE role_type_new;
-            USING (roles::text::role_type_new)
-    DROP TYPE role_type;
-    ALTER TYPE role_type_new RENAME TO role_type;
-COMMIT;
--- a/pkg/database/migrations/000004_add_sar_role_type.up.sql
+++ b/pkg/database/migrations/000004_add_sar_role_type.up.sql
@ -1 +0,0 @@
-ALTER TYPE role_type ADD VALUE 'sar';
--- a/pkg/database/migrations/000005_remove_null_from_lists.down.sql
+++ b/pkg/database/migrations/000005_remove_null_from_lists.down.sql
@ -1,6 +0,0 @@
-BEGIN;
-    ALTER TABLE messages
-        ALTER COLUMN previous_content DROP NOT NULL;
-    ALTER TABLE messages
-        ALTER COLUMN previous_content DROP DEFAULT;
-COMMIT;
--- a/pkg/database/migrations/000005_remove_null_from_lists.up.sql
+++ b/pkg/database/migrations/000005_remove_null_from_lists.up.sql
@ -1,6 +0,0 @@
-BEGIN;
-    ALTER TABLE messages
-        ALTER COLUMN previous_content SET NOT NULL;
-    ALTER TABLE messages
-        ALTER COLUMN previous_content SET DEFAULT array[]::varchar[];
-COMMIT;
--- a/pkg/database/migrations/000006_add_ftp_credentials.down.sql
+++ b/pkg/database/migrations/000006_add_ftp_credentials.down.sql
@ -1,6 +0,0 @@
-BEGIN;
-    ALTER TABLE servers
-        DROP COLUMN ftp_port,
-        DROP COLUMN ftp_username,
-        DROP COLUMN ftp_password;
-COMMIT;
--- a/pkg/database/migrations/000006_add_ftp_credentials.up.sql
+++ b/pkg/database/migrations/000006_add_ftp_credentials.up.sql
@ -1,6 +0,0 @@
-BEGIN;
-    ALTER TABLE servers
-        ADD COLUMN ftp_port int4,
-        ADD COLUMN ftp_username varchar(200),
-        ADD COLUMN ftp_password varchar(200);
-COMMIT;
--- a/pkg/database/patreon.go
+++ b/pkg/database/patreon.go
@ -1,178 +0,0 @@
-package database
-
-import (
-	"database/sql"
-	"log"
-
-	"github.com/dustinpianalto/geeksbot"
-)
-
-type patreonService struct {
-	db *sql.DB
-}
-
-func (s patreonService) PatreonCreatorByID(id int) (geeksbot.PatreonCreator, error) {
-	var creator geeksbot.PatreonCreator
-	var gID string
-	queryString := "SELECT id, creator, link, guild_id FROM patreon_creator WHERE id = $1"
-	row := s.db.QueryRow(queryString, id)
-	err := row.Scan(&creator.ID, &creator.Creator, &creator.Link, &gID)
-	if err != nil {
-		return geeksbot.PatreonCreator{}, err
-	}
-	guild, err := GuildService.Guild(gID)
-	if err != nil {
-		return geeksbot.PatreonCreator{}, err
-	}
-	creator.Guild = guild
-	return creator, nil
-}
-
-func (s patreonService) PatreonCreatorByName(name string, g geeksbot.Guild) (geeksbot.PatreonCreator, error) {
-	var id int
-	queryString := "SELECT id FROM patreon_creator WHERE creator = $1 AND guild_id = $2"
-	err := s.db.QueryRow(queryString, name, g.ID).Scan(&id)
-	if err != nil {
-		return geeksbot.PatreonCreator{}, nil
-	}
-	creator, err := s.PatreonCreatorByID(id)
-	return creator, err
-}
-
-func (s patreonService) CreatePatreonCreator(c geeksbot.PatreonCreator) (geeksbot.PatreonCreator, error) {
-	var id int
-	queryString := `INSERT INTO patreon_creator (creator, link, guild_id) VALUES ($1, $2, $3) RETURNING id`
-	err := s.db.QueryRow(queryString, c.Creator, c.Link, c.Guild.ID).Scan(&id)
-	if err != nil {
-		return geeksbot.PatreonCreator{}, err
-	}
-	c.ID = id
-	return c, nil
-}
-
-func (s patreonService) UpdatePatreonCreator(c geeksbot.PatreonCreator) (geeksbot.PatreonCreator, error) {
-	queryString := `UPDATE patreon_creator SET creator = $2, link = $3 WHERE id = $1`
-	_, err := s.db.Exec(queryString, c.ID, c.Creator, c.Link)
-	return c, err
-}
-
-func (s patreonService) DeletePatreonCreator(c geeksbot.PatreonCreator) error {
-	queryString := `DELETE FROM patreon_creator WHERE id = $1`
-	_, err := s.db.Exec(queryString, c.ID)
-	return err
-}
-
-func (s patreonService) PatreonTierByID(id int) (geeksbot.PatreonTier, error) {
-	var tier geeksbot.PatreonTier
-	var cID int
-	var rID string
-	var next int
-	queryString := `SELECT id, name, description, creator, role, next_tier FROM patreon_tier WHERE id = id`
-	err := s.db.QueryRow(queryString, id).Scan(&tier.ID, &tier.Name, &tier.Description, &cID, &rID, &next)
-	if err != nil {
-		return geeksbot.PatreonTier{}, err
-	}
-	creator, err := s.PatreonCreatorByID(cID)
-	if err != nil {
-		return geeksbot.PatreonTier{}, err
-	}
-	tier.Creator = creator
-	role, err := GuildService.Role(rID)
-	if err != nil {
-		return geeksbot.PatreonTier{}, err
-	}
-	tier.Role = role
-	if next == -1 {
-		tier.NextTier = nil
-		return tier, nil
-	}
-	nextTier, err := s.PatreonTierByID(next)
-	if err != nil {
-		return geeksbot.PatreonTier{}, err
-	}
-	tier.NextTier = &nextTier
-	return tier, nil
-}
-
-func (s patreonService) PatreonTierByName(name string, creator string) (geeksbot.PatreonTier, error) {
-	var id int
-	queryString := `SELECT id FROM patreon_tier WHERE name = $1 AND creator = $2`
-	err := s.db.QueryRow(queryString, name, creator).Scan(&id)
-	if err != nil {
-		return geeksbot.PatreonTier{}, err
-	}
-	tier, err := s.PatreonTierByID(id)
-	return tier, err
-}
-
-func (s patreonService) CreatePatreonTier(t geeksbot.PatreonTier) (geeksbot.PatreonTier, error) {
-	var id int
-	queryString := `INSERT INTO patreon_tier (name, description, creator, role, next_tier)
-						VALUES ($1, $2, $3, $4, $5) RETURNING id`
-	err := s.db.QueryRow(queryString, t.Name, t.Description, t.Creator.ID, t.Role.ID, t.NextTier.ID).Scan(&id)
-	if err != nil {
-		return geeksbot.PatreonTier{}, err
-	}
-	t.ID = id
-	return t, nil
-}
-
-func (s patreonService) UpdatePatreonTier(t geeksbot.PatreonTier) (geeksbot.PatreonTier, error) {
-	queryString := `UPDATE patreon_tier SET name = $2, description = $3, role = $4, next_tier = $5 WHERE id = $1`
-	_, err := s.db.Exec(queryString, t.ID, t.Name, t.Description, t.Role.ID, t.NextTier.ID)
-	return t, err
-}
-
-func (s patreonService) DeletePatreonTier(t geeksbot.PatreonTier) error {
-	queryString := `DELETE FROM patreon_tier WHERE id = $1`
-	_, err := s.db.Exec(queryString, t.ID)
-	return err
-}
-
-func (s patreonService) GuildPatreonCreators(g geeksbot.Guild) ([]geeksbot.PatreonCreator, error) {
-	var creators []geeksbot.PatreonCreator
-	queryString := `SELECT id FROM patreon_creator WHERE guild_id = $1`
-	rows, err := s.db.Query(queryString, g.ID)
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		var id int
-		err := rows.Scan(&id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		creator, err := s.PatreonCreatorByID(id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		creators = append(creators, creator)
-	}
-	return creators, nil
-}
-
-func (s patreonService) CreatorPatreonTiers(c geeksbot.PatreonCreator) ([]geeksbot.PatreonTier, error) {
-	var tiers []geeksbot.PatreonTier
-	queryString := `SELECT id FROM patreon_tier WHERE creator = $1`
-	rows, err := s.db.Query(queryString, c.ID)
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		var id int
-		err := rows.Scan(&id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		tier, err := s.PatreonTierByID(id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		tiers = append(tiers, tier)
-	}
-	return tiers, nil
-}
--- a/pkg/database/request.go
+++ b/pkg/database/request.go
@ -1,238 +0,0 @@
-package database
-
-import (
-	"database/sql"
-	"log"
-
-	"github.com/dustinpianalto/geeksbot"
-)
-
-type requestService struct {
-	db *sql.DB
-}
-
-func (s requestService) Request(id int64) (geeksbot.Request, error) {
-	var r geeksbot.Request
-	var aID string
-	var cID string
-	var gID string
-	var uID sql.NullString
-	var mID string
-	queryString := `SELECT id, author_id, channel_id, guild_id, content, requested_at, completed,
-						completed_at, completed_by, message_id, completed_message FROM requests
-						WHERE id = $1`
-	row := s.db.QueryRow(queryString, id)
-	err := row.Scan(&r.ID, &aID, &cID, &gID, &r.Content, &r.RequestedAt, &r.Completed,
-		&r.CompletedAt, &uID, &mID, &r.CompletedMessage)
-	if err != nil {
-		return geeksbot.Request{}, err
-	}
-	author, err := UserService.User(aID)
-	if err != nil {
-		return geeksbot.Request{}, err
-	}
-	guild, err := GuildService.Guild(gID)
-	if err != nil {
-		return geeksbot.Request{}, err
-	}
-	channel, err := ChannelService.Channel(cID)
-	if err != nil {
-		return geeksbot.Request{}, err
-	}
-	if !uID.Valid {
-		r.CompletedBy = nil
-	} else {
-		completedBy, err := UserService.User(uID.String)
-		if err != nil {
-			return geeksbot.Request{}, err
-		}
-		r.CompletedBy = &completedBy
-	}
-	message, err := MessageService.Message(mID)
-	if err != nil {
-		return geeksbot.Request{}, err
-	}
-	r.Author = author
-	r.Guild = guild
-	r.Channel = channel
-	r.Message = message
-	return r, nil
-}
-
-func (s requestService) UserRequests(u geeksbot.User, completed bool) ([]geeksbot.Request, error) {
-	var requests []geeksbot.Request
-	var queryString string
-	if completed {
-		queryString = "SELECT id FROM requests WHERE author_id = $1"
-	} else {
-		queryString = "SELECT id FROM requests WHERE author_id = $1 AND completed = False"
-	}
-	rows, err := s.db.Query(queryString, u.ID)
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		var id int64
-		err = rows.Scan(&id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		request, err := s.Request(id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		requests = append(requests, request)
-	}
-	return requests, nil
-}
-
-func (s requestService) GuildRequests(g geeksbot.Guild, completed bool) ([]geeksbot.Request, error) {
-	var requests []geeksbot.Request
-	var queryString string
-	if completed {
-		queryString = "SELECT id FROM requests WHERE guild_id = $1"
-	} else {
-		queryString = "SELECT id FROM requests WHERE guild_id = $1 AND completed = False"
-	}
-	rows, err := s.db.Query(queryString, g.ID)
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		var id int64
-		err = rows.Scan(&id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		request, err := s.Request(id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		requests = append(requests, request)
-	}
-	return requests, nil
-
-}
-
-func (s requestService) CreateRequest(r geeksbot.Request) (geeksbot.Request, error) {
-	queryString := `INSERT INTO requests 
-						(author_id, channel_id, guild_id, content, requested_at, 
-							completed, completed_at, completed_by, message_id, completed_message)
-						VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING id`
-	var id int64
-	var completedByID sql.NullString
-	if r.CompletedBy == nil {
-		completedByID.String = ""
-		completedByID.Valid = false
-	} else {
-		completedByID.String = r.CompletedBy.ID
-		completedByID.Valid = true
-	}
-	err := s.db.QueryRow(queryString,
-		r.Author.ID,
-		r.Channel.ID,
-		r.Guild.ID,
-		r.Content,
-		r.RequestedAt,
-		r.Completed,
-		r.CompletedAt,
-		completedByID,
-		r.Message.ID,
-		r.CompletedMessage).Scan(&id)
-	if err != nil {
-		return geeksbot.Request{}, err
-	}
-	r.ID = id
-	return r, nil
-}
-
-func (s requestService) UpdateRequest(r geeksbot.Request) (geeksbot.Request, error) {
-	queryString := `UPDATE requests SET 
-						completed = $2, completed_at = $3, completed_by = $4, completed_message = $5
-						WHERE id = $1`
-	_, err := s.db.Exec(queryString, r.ID, r.Completed, r.CompletedAt, r.CompletedBy.ID, r.CompletedMessage)
-	return r, err
-}
-
-func (s requestService) DeleteRequest(r geeksbot.Request) error {
-	queryString := "DELETE FROM requests WHERE id = $1"
-	_, err := s.db.Exec(queryString, r.ID)
-	return err
-}
-
-func (s requestService) Comment(id int64) (geeksbot.Comment, error) {
-	var c geeksbot.Comment
-	var aID string
-	var rID int64
-	queryString := "SELECT id, author_id, request_id, comment_at, content FROM comments WHERE id = $1"
-	row := s.db.QueryRow(queryString, id)
-	err := row.Scan(&c.ID, &aID, &rID, &c.CommentAt, &c.Content)
-	if err != nil {
-		return geeksbot.Comment{}, err
-	}
-	author, err := UserService.User(aID)
-	if err != nil {
-		return geeksbot.Comment{}, err
-	}
-	c.Author = author
-	request, err := s.Request(rID)
-	if err != nil {
-		return geeksbot.Comment{}, err
-	}
-	c.Request = request
-	return c, nil
-}
-
-func (s requestService) RequestComments(r geeksbot.Request) ([]geeksbot.Comment, error) {
-	var comments []geeksbot.Comment
-	queryString := "SELECT id FROM comments WHERE request_id = $1"
-	rows, err := s.db.Query(queryString, r.ID)
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		var id int64
-		err := rows.Scan(&id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		comment, err := s.Comment(id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		comments = append(comments, comment)
-	}
-	return comments, nil
-}
-
-func (s requestService) RequestCommentCount(r geeksbot.Request) (int, error) {
-	var count int
-	queryString := "SELECT COUNT(id) FROM comments WHERE request_id = $1"
-	row := s.db.QueryRow(queryString, r.ID)
-	err := row.Scan(&count)
-	return count, err
-}
-
-func (s requestService) CreateComment(c geeksbot.Comment) (geeksbot.Comment, error) {
-	queryString := `INSERT INTO comments (author_id, request_id, comment_at, content)
-						VALUES ($1, $2, $3, $4) RETURNING id`
-	var id int64
-	err := s.db.QueryRow(queryString, c.Author.ID, c.Request.ID, c.CommentAt, c.Content).Scan(&id)
-	if err != nil {
-		return geeksbot.Comment{}, err
-	}
-	c.ID = id
-	return c, nil
-}
-
-func (s requestService) DeleteComment(c geeksbot.Comment) error {
-	queryString := "DELETE FROM comments WHERE id = $1"
-	_, err := s.db.Exec(queryString, c.ID)
-	return err
-}
--- a/pkg/database/server.go
+++ b/pkg/database/server.go
@ -1,159 +0,0 @@
-package database
-
-import (
-	"database/sql"
-	"log"
-
-	"github.com/dustinpianalto/geeksbot"
-)
-
-type serverService struct {
-	db *sql.DB
-}
-
-func (s serverService) ServerByID(id int) (geeksbot.Server, error) {
-	var server geeksbot.Server
-	var guildID string
-	var aChanID sql.NullString
-	var iChanID sql.NullString
-	var iMsgID sql.NullString
-	var sMsgID sql.NullString
-	queryString := `SELECT id, name, ip_address, port, password, alerts_channel_id, 
-						guild_id, info_channel_id, info_message_id, settings_message_id,
-						ftp_port, ftp_username, ftp_password
-						FROM servers WHERE id = $1`
-	row := s.db.QueryRow(queryString, id)
-	err := row.Scan(&server.ID, &server.Name, &server.IPAddr, &server.Port, &server.Password,
-		&aChanID, &guildID, &iChanID, &iMsgID, &sMsgID, &server.FTPPort, &server.FTPUser, &server.FTPPass)
-	if err != nil {
-		return geeksbot.Server{}, err
-	}
-	guild, err := GuildService.Guild(guildID)
-	if err != nil {
-		return geeksbot.Server{}, err
-	}
-	if !aChanID.Valid {
-		server.AlertsChannel = nil
-	} else {
-		alertChannel, err := ChannelService.Channel(aChanID.String)
-		if err != nil {
-			return geeksbot.Server{}, err
-		}
-		server.AlertsChannel = &alertChannel
-	}
-	if !iChanID.Valid {
-		server.InfoChannel = nil
-	} else {
-		infoChannel, err := ChannelService.Channel(iChanID.String)
-		if err != nil {
-			return geeksbot.Server{}, err
-		}
-		server.InfoChannel = &infoChannel
-	}
-	if !iMsgID.Valid {
-		server.InfoMessage = nil
-	} else {
-		infoMessage, err := MessageService.Message(iMsgID.String)
-		if err != nil {
-			return geeksbot.Server{}, err
-		}
-		server.InfoMessage = &infoMessage
-	}
-	if !sMsgID.Valid {
-		server.SettingsMessage = nil
-	} else {
-		settingsMessage, err := MessageService.Message(sMsgID.String)
-		if err != nil {
-			return geeksbot.Server{}, err
-		}
-		server.SettingsMessage = &settingsMessage
-	}
-	server.Guild = guild
-	return server, nil
-}
-
-func (s serverService) ServerByName(name string, guild geeksbot.Guild) (geeksbot.Server, error) {
-	var id int
-	queryString := "SELECT id FROM servers WHERE LOWER(name) = LOWER($1) AND guild_id = $2"
-	row := s.db.QueryRow(queryString, name, guild.ID)
-	err := row.Scan(&id)
-	if err != nil {
-		return geeksbot.Server{}, err
-	}
-	server, err := s.ServerByID(id)
-	return server, err
-}
-
-func (s serverService) CreateServer(server geeksbot.Server) (geeksbot.Server, error) {
-	var id int
-	queryString := `INSERT INTO servers (name, ip_address, port, password, alerts_channel_id, 
-						guild_id, info_channel_id, info_message_id, settings_message_id)
-						VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING id`
-	err := s.db.QueryRow(queryString,
-		server.Name,
-		server.IPAddr,
-		server.Port,
-		server.Password,
-		server.AlertsChannel,
-		server.Guild,
-		server.InfoChannel,
-		server.InfoMessage,
-		server.SettingsMessage,
-	).Scan(&id)
-	if err != nil {
-		return geeksbot.Server{}, err
-	}
-	server.ID = id
-	return server, nil
-}
-
-func (s serverService) DeleteServer(server geeksbot.Server) error {
-	queryString := `DELETE FROM servers WHERE id = $1`
-	_, err := s.db.Exec(queryString, server.ID)
-	return err
-}
-
-func (s serverService) UpdateServer(server geeksbot.Server) (geeksbot.Server, error) {
-	queryString := `UPDATE servers SET name = $2, ip_address = $3, port = $4, password = $5,
-						alerts_channel_id = $6, info_channel_id = $7, info_message_id = $8,
-						settings_message_id = $9, ftp_port = $10, ftp_username = $11,
-						ftp_password = $12 WHERE id = $1`
-	_, err := s.db.Exec(queryString,
-		server.Name,
-		server.IPAddr,
-		server.Port,
-		server.Password,
-		server.AlertsChannel.ID,
-		server.InfoChannel.ID,
-		server.InfoMessage.ID,
-		server.SettingsMessage.ID,
-		server.FTPPort,
-		server.FTPUser,
-		server.FTPPass,
-	)
-	return server, err
-}
-
-func (s serverService) GuildServers(g geeksbot.Guild) ([]geeksbot.Server, error) {
-	var servers []geeksbot.Server
-	queryString := `SELECT id FROM servers WHERE guild_id = $1`
-	rows, err := s.db.Query(queryString, g.ID)
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		var id int
-		err = rows.Scan(&id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		server, err := s.ServerByID(id)
-		if err != nil {
-			log.Println(err)
-			continue
-		}
-		servers = append(servers, server)
-	}
-	return servers, nil
-}
--- a/pkg/database/user.go
+++ b/pkg/database/user.go
@ -1,62 +0,0 @@
-package database
-
-import (
-	"database/sql"
-
-	"github.com/dustinpianalto/geeksbot"
-)
-
-type userService struct {
-	db *sql.DB
-}
-
-func (s userService) User(id string) (geeksbot.User, error) {
-	var user geeksbot.User
-	queryString := "SELECT id, steam_id, active, staff, admin FROM users WHERE id = $1"
-	row := s.db.QueryRow(queryString, id)
-	err := row.Scan(&user.ID, &user.SteamID, &user.IsActive, &user.IsStaff, &user.IsAdmin)
-	return user, err
-}
-
-func (s userService) CreateUser(u geeksbot.User) (geeksbot.User, error) {
-	queryString := "INSERT INTO users (id, steam_id, active, staff, admin) VALUES ($1, $2, $3, $4, $5)"
-	var err error
-	_, err = s.db.Exec(queryString, u.ID, u.SteamID, u.IsActive, u.IsStaff, u.IsAdmin)
-	return u, err
-}
-
-func (s userService) DeleteUser(u geeksbot.User) error {
-	queryString := "DELETE FROM users WHERE id = $1"
-	_, err := s.db.Exec(queryString, u.ID)
-	return err
-}
-
-func (s userService) UpdateUser(u geeksbot.User) (geeksbot.User, error) {
-	queryString := "UPDATE users SET steam_id = $2, active = $3, staff = $4, admin = $5 WHERE id = $1"
-	_, err := s.db.Exec(queryString, u.ID, u.SteamID, u.IsActive, u.IsStaff, u.IsAdmin)
-	return u, err
-}
-
-func (s userService) GetOrCreateUser(id string) (geeksbot.User, error) {
-	user, err := s.User(id)
-	if err == sql.ErrNoRows {
-		user, err = s.CreateUser(geeksbot.User{
-			ID:       id,
-			IsActive: true,
-			IsAdmin:  false,
-			IsStaff:  false,
-		})
-	}
-	return user, err
-}
-
-func (s userService) GetBySteamID(steamID string) (geeksbot.User, error) {
-	var id string
-	queryString := "SELECT id FROM users WHERE steam_id = $1"
-	err := s.db.QueryRow(queryString, steamID).Scan(&id)
-	if err != nil {
-		return geeksbot.User{}, err
-	}
-	user, err := s.User(id)
-	return user, err
-}
--- a/pkg/services/services.go
+++ b/pkg/services/services.go
@ -1,26 +0,0 @@
-package services
-
-import (
-	"github.com/dustinpianalto/geeksbot"
-	"github.com/dustinpianalto/geeksbot/pkg/database"
-)
-
-var (
-	GuildService   geeksbot.GuildService
-	UserService    geeksbot.UserService
-	ChannelService geeksbot.ChannelService
-	MessageService geeksbot.MessageService
-	PatreonService geeksbot.PatreonService
-	RequestService geeksbot.RequestService
-	ServerService  geeksbot.ServerService
-)
-
-func InitializeServices() {
-	GuildService = database.GuildService
-	UserService = database.UserService
-	ChannelService = database.ChannelService
-	MessageService = database.MessageService
-	PatreonService = database.PatreonService
-	RequestService = database.RequestService
-	ServerService = database.ServerService
-}
--- a/request.go
+++ b/request.go
@ -1,42 +1,37 @@
 package geeksbot

-import (
-	"database/sql"
-	"time"
-)
+import "time"

 type Request struct {
 	ID               int64
-	Author           User
-	Channel          Channel
-	Guild            Guild
+	Author           *User
+	Channel          *Channel
 	Content          string
 	RequestedAt      time.Time
-	Completed        bool
-	CompletedAt      sql.NullTime
+	CompletedAt      time.Time
 	CompletedBy      *User
-	Message          Message
-	CompletedMessage sql.NullString
+	Message          *Message
+	CompletedMessage string
 }

 type Comment struct {
 	ID        int64
-	Author    User
-	Request   Request
+	Author    *User
+	Request   *Request
 	CommentAt time.Time
 	Content   string
 }

 type RequestService interface {
-	Request(id int64) (Request, error)
-	UserRequests(u User, completed bool) ([]Request, error)
-	GuildRequests(g Guild, completed bool) ([]Request, error)
-	CreateRequest(r Request) (Request, error)
-	UpdateRequest(r Request) (Request, error)
-	DeleteRequest(r Request) error
-	Comment(id int64) (Comment, error)
-	RequestComments(r Request) ([]Comment, error)
-	RequestCommentCount(r Request) (int, error)
-	CreateComment(c Comment) (Comment, error)
-	DeleteComment(c Comment) error
+	Request(id int64) (*Request, error)
+	UserRequests(u *User, completed bool) ([]*Request, error)
+	GuildRequests(g *Guild, completed bool) ([]*Request, error)
+	CreateRequest(r *Request) (*Request, error)
+	UpdateRequest(r *Request) (*Request, error)
+	DeleteRequest(r *Request) error
+	Comment(id int64) (*Comment, error)
+	RequestComments(r *Request) ([]*Comment, error)
+	RequestCommentCount(r *Request) (int, error)
+	CreateComment(c *Comment) (*Comment, error)
+	DeleteComment(c *Comment) error
 }
--- a/server.go
+++ b/server.go
@ -7,20 +7,17 @@ type Server struct {
 	Port            int
 	Password        string
 	AlertsChannel   *Channel
-	Guild           Guild
+	Guild           *Guild
 	InfoChannel     *Channel
 	InfoMessage     *Message
 	SettingsMessage *Message
-	FTPPort         int
-	FTPUser         string
-	FTPPass         string
 }

 type ServerService interface {
-	ServerByID(id int) (Server, error)
-	ServerByName(name string, guild Guild) (Server, error)
-	CreateServer(s Server) (Server, error)
-	DeleteServer(s Server) error
-	UpdateServer(s Server) (Server, error)
-	GuildServers(g Guild) ([]Server, error)
+	ServerByID(id int) (*Server, error)
+	ServerByName(name string) (*Server, error)
+	CreateServer(s *Server) (*Server, error)
+	DeleteServer(s *Server) error
+	UpdateServer(s *Server) (*Server, error)
+	GuildServers(g *Guild) ([]*Server, error)
 }
--- a/user.go
+++ b/user.go
@ -11,10 +11,8 @@ type User struct {
 }

 type UserService interface {
-	User(id string) (User, error)
-	CreateUser(u User) (User, error)
-	DeleteUser(u User) error
-	UpdateUser(u User) (User, error)
-	GetOrCreateUser(id string) (User, error)
-	GetBySteamID(steamID string) (User, error)
+	User(id string) (*User, error)
+	CreateUser(u *User) (*User, error)
+	DeleteUser(u *User) error
+	UpdateUser(u *User) (*User, error)
 }