diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Portfolio.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Portfolio.java
index fcb26a0..0c39fb4 100644
--- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Portfolio.java
+++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Model/Portfolio.java
@@ -23,7 +23,11 @@ public Portfolio() {
    * @return true or false based on if the operation was successful or not.
    */
   public boolean addShare(Share share) {
-    return true;
+    if (share == null) {
+      return false;
+    } else {
+      return shares.add(share);
+    }
   }
 
   /**
@@ -32,7 +36,11 @@ public boolean addShare(Share share) {
    * @return true or false based on if the operation was successful or not.
    */
   public boolean removeShare(Share share) {
-    return false;
+    if (share == null || !shares.contains(share)) {
+      return false;
+    } else {
+      return shares.remove(share);
+    }
   }
 
   public List<Share> getShares() {
@@ -45,6 +53,6 @@ public List<Share> getShares() {
    * @return true or false based on if the share was found or not.
    */
   public boolean contains(Share share) {
-    return true;
+    return share != null && shares.contains(share);
   }
 }