diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java
index b69065c..a33debe 100644
--- a/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java
+++ b/src/main/java/com/zipcodewilmington/bakery/controllers/BakerController.java
@@ -2,33 +2,44 @@
 
 import com.zipcodewilmington.bakery.models.Baker;
 import com.zipcodewilmington.bakery.services.BakerService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 
+@RestController
+@RequestMapping(value = "/baker-controller")
 public class BakerController {
+    @Autowired
     private BakerService service;
 
     public BakerController(BakerService service) {
         this.service = service;
     }
 
+    @GetMapping(value = "/getAllBaker")
     public ResponseEntity<Iterable<Baker>> index() {
         return new ResponseEntity<>(service.index(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Baker> show(Long id) {
+    @GetMapping(value = "/getBakerById/{id}")
+    public ResponseEntity<Baker> show(@PathVariable Long id) {
         return new ResponseEntity<>(service.show(id), HttpStatus.OK);
     }
 
-    public ResponseEntity<Baker> create(Baker baker) {
+    @PostMapping(value = "/createBaker")
+    public ResponseEntity<Baker> create(@RequestBody Baker baker) {
         return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Baker> update(Long id, Baker baker) {
+    @PutMapping(value = "/updateBaker/{id}")
+    public ResponseEntity<Baker> update(@PathVariable Long id, @RequestBody Baker baker) {
         return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK);
     }
 
-    public ResponseEntity<Boolean> destroy(Long id) {
+    @DeleteMapping(value = "/deleteBaker")
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
         return new ResponseEntity<>(service.delete(id), HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java
index f6b5d42..2df141b 100644
--- a/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java
+++ b/src/main/java/com/zipcodewilmington/bakery/controllers/MuffinController.java
@@ -2,33 +2,43 @@
 
 import com.zipcodewilmington.bakery.models.Muffin;
 import com.zipcodewilmington.bakery.services.MuffinService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
 
+@Controller
+@RequestMapping(value = "/muffin-controller")
 public class MuffinController {
+    @Autowired
     private MuffinService service;
 
     public MuffinController(MuffinService service) {
         this.service = service;
     }
 
+    @GetMapping(value = "/getAllMuffin")
     public ResponseEntity<Iterable<Muffin>> index() {
         return new ResponseEntity<>(service.index(), HttpStatus.OK);
     }
 
-    public ResponseEntity<Muffin> show(Long id) {
+    @GetMapping(value = "/getMuffinById/{id}")
+    public ResponseEntity<Muffin> show(@PathVariable Long id) {
         return new ResponseEntity<>(service.show(id), HttpStatus.OK);
     }
 
-    public ResponseEntity<Muffin> create(Muffin baker) {
+    @PostMapping(value = "/createMuffin")
+    public ResponseEntity<Muffin> create(@RequestBody Muffin baker) {
         return new ResponseEntity<>(service.create(baker), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Muffin> update(Long id, Muffin baker) {
+    @PutMapping(value = "/updateMuffin/{id}")
+    public ResponseEntity<Muffin> update(@PathVariable Long id, @RequestBody Muffin baker) {
         return new ResponseEntity<>(service.update(id, baker), HttpStatus.OK);
     }
-
-    public ResponseEntity<Boolean> destroy(Long id) {
+    @DeleteMapping(value = "/deleteMuffin/{id}")
+    public ResponseEntity<Boolean> destroy(@PathVariable Long id) {
         return new ResponseEntity<>(service.delete(id), HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java
index 8e8c716..a1a8998 100644
--- a/src/main/java/com/zipcodewilmington/bakery/models/Baker.java
+++ b/src/main/java/com/zipcodewilmington/bakery/models/Baker.java
@@ -1,15 +1,18 @@
 package com.zipcodewilmington.bakery.models;
 
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import java.util.Objects;
-
+@Entity
 public class Baker {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-
     private String name;
-
     private String employeeId;
-
     private String specialty;
 
     public Baker() {
diff --git a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java
index 9b374a1..a6e6fa1 100644
--- a/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java
+++ b/src/main/java/com/zipcodewilmington/bakery/models/Muffin.java
@@ -1,16 +1,23 @@
 package com.zipcodewilmington.bakery.models;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import java.util.Objects;
 
+@Entity
 public class Muffin {
-
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-
     private String flavor;
 
     public Muffin() {
     }
-
+    //@JsonProperty("flavor")
     public Muffin(String flavor) {
         this.flavor = flavor;
     }
diff --git a/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java b/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java
index 65923a1..ee03f03 100644
--- a/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java
+++ b/src/main/java/com/zipcodewilmington/bakery/repositories/BakerRepository.java
@@ -2,6 +2,8 @@
 
 import com.zipcodewilmington.bakery.models.Baker;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface BakerRepository extends CrudRepository<Baker, Long> {
 }
diff --git a/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java b/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java
index f63c832..4b8c814 100644
--- a/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java
+++ b/src/main/java/com/zipcodewilmington/bakery/repositories/MuffinRepository.java
@@ -2,6 +2,8 @@
 
 import com.zipcodewilmington.bakery.models.Muffin;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface MuffinRepository extends CrudRepository<Muffin, Long> {
 }
diff --git a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java b/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java
index 6b2fb31..057a678 100644
--- a/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java
+++ b/src/main/java/com/zipcodewilmington/bakery/services/BakerService.java
@@ -2,8 +2,12 @@
 
 import com.zipcodewilmington.bakery.models.Baker;
 import com.zipcodewilmington.bakery.repositories.BakerRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+@Service
 public class BakerService {
+    @Autowired
     private BakerRepository repository;
 
     public BakerService(BakerRepository repository) {
diff --git a/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java b/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java
index 69ce276..107f36a 100644
--- a/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java
+++ b/src/main/java/com/zipcodewilmington/bakery/services/MuffinService.java
@@ -2,8 +2,12 @@
 
 import com.zipcodewilmington.bakery.models.Muffin;
 import com.zipcodewilmington.bakery.repositories.MuffinRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+@Service
 public class MuffinService {
+    @Autowired
     private MuffinRepository repository;
 
     public MuffinService(MuffinRepository repository) {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e69de29..85dd4b9 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -0,0 +1,4 @@
+server.port=8080
+spring.datasource.url=jdbc:h2:mem:testdb
+spring.h2.console.enabled=true
+spring.h2.console.view=/h2-console
\ No newline at end of file