diff --git a/controllers/authController.go b/controllers/authController.go
index c2f7cf2..a2aa3e0 100644
--- a/controllers/authController.go
+++ b/controllers/authController.go
@@ -144,7 +144,5 @@ func GetAllUsers(c *fiber.Ctx) error {
 		return fiber.ErrNotFound
 	}
 
-	return c.JSON(fiber.Map{
-		"users": users,
-	})
+	return c.JSON(users)
 }
diff --git a/controllers/eventController.go b/controllers/eventController.go
index c2ef121..31145a8 100644
--- a/controllers/eventController.go
+++ b/controllers/eventController.go
@@ -29,12 +29,20 @@ func AddEvent(c *fiber.Ctx) error {
 		return fiber.ErrBadRequest
 	}
 
+	if data["name"] == "" || data["description"] == "" {
+		return fiber.ErrBadRequest
+	}
+
 	user := dbaccess.GetUserById(u)
 
 	if user.Id == 0 {
 		return fiber.ErrBadRequest
 	}
 
+	if user.Blocked == "Y" || user.Cancelled == "Y" {
+		return fiber.ErrForbidden
+	}
+
 	dateformat := "02/01/2006 15:04"
 	if data["startDt"] == "" {
 		return fiber.ErrBadRequest
@@ -47,8 +55,8 @@ func AddEvent(c *fiber.Ctx) error {
 
 	event := models.Event{
 		Name:         data["name"],
+		Description:  data["description"],
 		UserId:       user.Id,
-		User:         user,
 		Channel:      user.Channel,
 		ExpectedDate: startdt,
 		EventType:    data["eventtype"],
@@ -60,7 +68,24 @@ func AddEvent(c *fiber.Ctx) error {
 		return fiber.ErrNotAcceptable
 	}
 
-	return c.JSON(fiber.Map{
-		"event":  event,
-	})
+	return c.JSON(event)
+}
+
+// GetAllEvents - Returns all events
+func GetAllEvents(c *fiber.Ctx) error {
+
+	var events []models.Event
+
+	_, err := utils.ProcessToken(c)
+	if err != nil {
+		return fiber.ErrUnauthorized
+	}
+
+	database.DB.Find(&events)
+
+	if len(events) == 0 {
+		return fiber.ErrNotFound
+	}
+
+	return c.JSON(events)
 }
diff --git a/globals/globals.go b/globals/globals.go
index ede66e4..37b1849 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -1,6 +1,6 @@
 package globals
 
 var (
-	API_VERSION = "1.0.17"
+	API_VERSION = "1.0.18"
 	API_RELEASE = ""
 )
diff --git a/models/events.go b/models/events.go
index c40b6ad..4c058e7 100644
--- a/models/events.go
+++ b/models/events.go
@@ -9,6 +9,6 @@ type Event struct {
 	ExpectedDate time.Time `gorm:"not null" json:"startDt"`
 	UserId       uint      `gorm:"size:40;not null" json:"user"`
 	Channel      string    `gorm:"size:40;not null" json:"channel"`
-	User         User
-	EventType    string `gorm:"size:1;not null;default:O" json:"eventtype"` // O = Open, C = Closed
+	EventType    string    `gorm:"size:1;not null;default:O" json:"eventtype"`   // O = Open, C = Closed
+	Transmitted  string    `gorm:"size:1;not null;default:N" json:"transmitted"` // Y = Already transmitted, N = Not transmitted yet
 }
diff --git a/routes/routes.go b/routes/routes.go
index 89dbae4..97fc2ac 100644
--- a/routes/routes.go
+++ b/routes/routes.go
@@ -37,4 +37,5 @@ func Setup(app *fiber.App) {
 	protected.Post("user", controllers.AddUser)
 
 	protected.Post("event", controllers.AddEvent)
+	protected.Get("events", controllers.GetAllEvents)
 }