diff --git a/cmd/bot/main.go b/cmd/bot/main.go
index 022ab1e..eadca0a 100644
--- a/cmd/bot/main.go
+++ b/cmd/bot/main.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/gempir/go-twitch-irc/v3"
+	"github.com/go-co-op/gocron"
 	"github.com/joho/godotenv"
 	_ "github.com/lib/pq"
 	"github.com/lyx0/nourybot/internal/data"
@@ -33,6 +34,7 @@ type Application struct {
 	Logger       *zap.SugaredLogger
 	Db           *sql.DB
 	Models       data.Models
+	Scheduler    *gocron.Scheduler
 }
 
 func main() {
@@ -69,12 +71,15 @@ func main() {
 		sugar.Fatal(err)
 	}
 
+	s := gocron.NewScheduler(time.UTC)
+
 	// Initialize Application
 	app := &Application{
 		TwitchClient: tc,
 		Logger:       sugar,
 		Db:           db,
 		Models:       data.NewModels(db),
+		Scheduler:    s,
 	}
 
 	// Received a PrivateMessage (normal chat message).
@@ -143,6 +148,8 @@ func main() {
 		common.Send("uudelleenkytkeytynyt", "PepeS", app.TwitchClient)
 	})
 
+	s.StartAsync()
+
 	// Actually connect to chat.
 	err = app.TwitchClient.Connect()
 	if err != nil {
diff --git a/cmd/bot/timer.go b/cmd/bot/timer.go
index 99c802e..4240488 100644
--- a/cmd/bot/timer.go
+++ b/cmd/bot/timer.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/gempir/go-twitch-irc/v3"
-	"github.com/go-co-op/gocron"
 	"github.com/lyx0/nourybot/internal/data"
 	"github.com/lyx0/nourybot/pkg/common"
 )
@@ -39,13 +38,12 @@ func (app *Application) AddTimer(name string, message twitch.PrivateMessage) {
 
 	app.Logger.Infow("timer", timer)
 	err := app.Models.Timers.Insert(timer)
-
 	if err != nil {
 		reply := fmt.Sprintf("Something went wrong FeelsBadMan %s", err)
 		common.Send(message.Channel, reply, app.TwitchClient)
 		return
 	} else {
-
+		app.Scheduler.Tag("pipelines", fmt.Sprintf("%s-%s", message.Channel, name)).Every(repeat).StartAt(time.Now()).Do(app.newTimer, message.Channel, text)
 		reply := fmt.Sprintf("Successfully added timer %s repeating every %s", name, repeat)
 		common.Send(message.Channel, reply, app.TwitchClient)
 		return
@@ -64,10 +62,8 @@ func (app *Application) InitialTimers() {
 
 	app.Logger.Info(timer)
 
-	s := gocron.NewScheduler(time.UTC)
 	// Iterate over the slice of channels and join each.
 	for _, v := range timer {
-		s.TagsUnique()
 		app.Logger.Infow("Initial timers:",
 			"Name", v.Name,
 			"Channel", v.Channel,
@@ -76,12 +72,11 @@ func (app *Application) InitialTimers() {
 			"V", v,
 		)
 
-		s.Tag("pipelines", fmt.Sprintf("%s-%s", v.Channel, v.Name)).Every(v.Repeat).StartAt(time.Now()).Do(app.xD, v.Channel, v.Text)
+		app.Scheduler.Tag("pipelines", fmt.Sprintf("%s-%s", v.Channel, v.Name)).Every(v.Repeat).StartAt(time.Now()).Do(app.newTimer, v.Channel, v.Text)
 
 	}
-	s.StartAsync()
 }
 
-func (app *Application) xD(a, b string) {
-	common.Send(a, b, app.TwitchClient)
+func (app *Application) newTimer(channel, text string) {
+	common.Send(channel, text, app.TwitchClient)
 }