diff --git a/api/handlers/device.go b/api/handlers/device.go
new file mode 100644
index 0000000..65ea613
--- /dev/null
+++ b/api/handlers/device.go
@@ -0,0 +1,157 @@
+package handlers
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"time"
+
+	"github.com/gorilla/mux"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+
+	"github.com/SowinskiBraeden/SulliCartShare/config"
+	"github.com/SowinskiBraeden/SulliCartShare/databases"
+	"github.com/SowinskiBraeden/SulliCartShare/models"
+)
+
+// Cow exported for testing purposes
+type Device struct {
+	DB databases.DeviceDatabase
+}
+
+// CowHandler returns all cows
+func (d Device) DeviceHandler(w http.ResponseWriter, r *http.Request) {
+	dbResp, err := d.DB.Find(context.TODO(), bson.M{})
+	if err != nil {
+		config.ErrorStatus("failed to get devices", http.StatusNotFound, w, err)
+		return
+	}
+
+	// If len == 0 then we will just return an empty data object
+	if len(dbResp) == 0 {
+		dbResp = []models.Device{}
+	}
+	b, err := json.Marshal(dbResp)
+	if err != nil {
+		config.ErrorStatus("failed to marshal response", http.StatusInternalServerError, w, err)
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+	w.Write(b)
+}
+
+// CowHandlerQuery is the same as CowHanlder, but queries a specific list of objects by Name
+func (d Device) DeviceHandlerQuery(w http.ResponseWriter, r *http.Request) {
+	var query models.Query // Json data will represent the query model
+
+	// validate the request body
+	if err := json.NewDecoder(r.Body).Decode(&query); err != nil {
+		config.ErrorStatus("failed to unpack request body", http.StatusInternalServerError, w, err)
+		return
+	}
+
+	// use the validator library to validate required fields
+	if validationErr := validate.Struct(&query); validationErr != nil {
+		config.ErrorStatus("invalid request body", http.StatusBadRequest, w, validationErr)
+		return
+	}
+
+	dbResp, err := d.DB.Find(context.TODO(), bson.M{"detials.name": query.Name}) // Search by cow name
+	if err != nil {
+		config.ErrorStatus("failed to get cows", http.StatusNotFound, w, err)
+		return
+	}
+
+	// If len == 0 then we will just return an empty data object
+	if len(dbResp) == 0 {
+		dbResp = []models.Device{}
+	}
+	b, err := json.Marshal(dbResp)
+	if err != nil {
+		config.ErrorStatus("failed to marshal response", http.StatusInternalServerError, w, err)
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+	w.Write(b)
+}
+
+// CowByIDHandler returns a cow by ID
+func (d Device) DeviceByIDHandler(w http.ResponseWriter, r *http.Request) {
+	deviceID := mux.Vars(r)["cow_id"]
+
+	dbResp, err := d.DB.FindOne(context.Background(), bson.M{"_id": deviceID})
+	if err != nil {
+		config.ErrorStatus("failed to get device by ID", http.StatusNotFound, w, err)
+		return
+	}
+
+	b, err := json.Marshal(dbResp)
+	if err != nil {
+		config.ErrorStatus("failed to marshal responce", http.StatusInternalServerError, w, err)
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+	w.Write(b)
+}
+
+// NewCowHandler inserts a new cow into the collection and returns a result and error
+func (c Cow) NewDeviceHandler(w http.ResponseWriter, r *http.Request) {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	var deviceDetails models.DeviceDetails // Json data will represent the cow details model
+	defer cancel()
+
+	// validate the request body
+	if err := json.NewDecoder(r.Body).Decode(&deviceDetails); err != nil {
+		config.ErrorStatus("failed to unpack request body", http.StatusInternalServerError, w, err)
+		return
+	}
+
+	// use the validator library to validate required fields
+	if validationErr := validate.Struct(&deviceDetails); validationErr != nil {
+		config.ErrorStatus("invalid request body", http.StatusBadRequest, w, validationErr)
+
+		return
+	}
+
+	newDevice := models.Device{
+		ID:      primitive.NewObjectID().Hex(),
+		Details: deviceDetails,
+	}
+
+	result, err := c.DB.InsertOne(ctx, newDevice)
+	if err != nil {
+		config.ErrorStatus("failed to insert device", http.StatusBadRequest, w, err)
+		return
+	}
+
+	w.WriteHeader(http.StatusCreated)
+	response := models.UserResponse{Status: http.StatusCreated, Message: "success", Data: map[string]interface{}{"result": result}}
+	json.NewEncoder(w).Encode(response)
+}
+
+// UpdateCowHandler gets updates the data for an existing cow and returns a result and error
+func (c Cow) UpdateDeviceHandler(w http.ResponseWriter, r *http.Request) {
+	deviceID := mux.Vars(r)["cow_id"]
+
+	// TODO: Collect data to update from passed json
+	update := bson.M{
+		"$set": bson.M{
+			"cow.CowCode": "123",
+		},
+	}
+
+	dbResp, err := c.DB.UpdateOne(context.Background(), bson.M{"_id": deviceID}, update)
+	if err != nil {
+		config.ErrorStatus("the device could not be updated", http.StatusNotFound, w, err)
+		return
+	}
+
+	b, err := json.Marshal(dbResp)
+	if err != nil {
+		config.ErrorStatus("failed ot marshal response", http.StatusInternalServerError, w, err)
+		return
+	}
+	w.WriteHeader(http.StatusOK)
+	w.Write(b)
+}
diff --git a/models/device.go b/models/device.go
index 634a935..f05278e 100644
--- a/models/device.go
+++ b/models/device.go
@@ -2,13 +2,13 @@ package models
 
 // Device holds the structure for the device collection in mongo
 type Device struct {
-	ID      string        `json:"_id" bson:"_id"`       // MongoDB ID
-	Details DeviceDetails `json:"device" bson:"device"` // Details
+	ID      string        `json:"_id" bson:"_id"`         // MongoDB ID
+	Details DeviceDetails `json:"details" bson:"details"` // Details
 }
 
 // Device holds the structure for the Device collection in mongo
 type DeviceDetails struct {
-	Type   string `json:"Type" bson:"Type"`     // eg. Laptop, Ipdad, etc
-	Code   string `json:"Code" bson:"Code"`     // eg. SULH-LAP-01
-	Parent string `json:"Parent" bson:"Parent"` // Parent cow Mongo ID
+	Type   string `json:"type" bson:"type"`     // eg. Laptop, Ipdad, etc
+	Name   string `json:"name" bson:"name"`     // eg. SULH-LAP-01
+	Parent string `json:"parent" bson:"parent"` // Parent cow Mongo ID
 }