diff --git a/.gitignore b/.gitignore
index 549e00a..a4e851d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@ build/
 
 ### VS Code ###
 .vscode/
+
+!**/src/main/resources/application.properties
diff --git a/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java b/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java
index 3393d62..ac0f152 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/ExpenseTrackerFafApplication.java
@@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class ExpenseTrackerFafApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(ExpenseTrackerFafApplication.class, args);
     }
diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java
index 48f80c4..5c43723 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/model/Expense.java
@@ -26,20 +26,23 @@ public class Expense implements IMoneyTransaction {
 
     public Expense() {}
 
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
     @Override
     public User getUser() {
         return user;
     }
 
-    public void setUserId(int userId) {
+    public void setUser(User user) {
         this.user = user;
     }
 
-    @Override
-    public long getUserId() {
-        return 0;
-    }
-
     @Override
     public int getAmount() {
         return amount;
diff --git a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java
index 098c4de..55fbaef 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/model/Income.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/model/Income.java
@@ -26,14 +26,21 @@ public class Income implements IMoneyTransaction {
 
     public Income() {}
 
-    @Override
-    public User getUser() {
-        return user;
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
     }
 
     @Override
-    public long getUserId() {
-        return 0;
+    public User getUser() {
+        return user;
     }
 
     @Override
diff --git a/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java b/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java
index 7dfe2fd..8817420 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java
@@ -5,8 +5,6 @@ import com.faf223.expensetrackerfaf.model.User;
 public interface IMoneyTransaction {
 
     User getUser();
-
-    long getUserId();
     int getAmount();
     String getCategory();
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index 4d2c5a7..0000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-spring.datasource.url=jdbc:sqlserver://DANIEL-LAPTOP\\SQLEXPRESS01:1433;databaseName=AdventureWorks2022;user=Daniel1;password=daniel;encrypt=true;trustServerCertificate=true;
-spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect
-spring.jpa.hibernate.naming.physical-strategy=com.faf223.expensetrackerfaf.custom.UppercaseStrategy
-