diff --git a/src/App.jsx b/src/App.jsx
index d28c0b3..8b5371b 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,6 +1,6 @@
 import './styles/reset.css'
 import './styles/index.css'
-
+import React, {useState} from  'react'
 import initialStoreItems from './store-items'
 
 /*
@@ -14,24 +14,67 @@ import initialStoreItems from './store-items'
  What should a cart item look like? 🤔
  */
 
-console.log(initialStoreItems)
-
 export default function App() {
   // Setup state here...
+  const [storeItems, setStoreItems] = useState(initialStoreItems)
+  const [cartItems, setCartItems] = useState([])
+
+  const addToCart = (targetItem) => {
+    const existingItem = cartItems.find(item => item.id === targetItem.id);
+    if(existingItem){
+      const updatedCart = cartItems.map(item =>
+        item.id === targetItem.id ? {...item, quantity: item.quantity+1} : item
+      )
+      setCartItems(updatedCart)
+    } else{
+      setCartItems([...cartItems, targetItem])
+    }
+  }
+
+  const removeFromCart = (targetItem) => {
+    const existingItem = cartItems.find(item => item.id === targetItem.id);
+    if(existingItem.quantity > 1){
+      const updatedCart = cartItems.map(item =>
+        item.id === targetItem.id ? {...item, quantity: item.quantity-1} : item
+      )
+      setCartItems(updatedCart)
+    } else{
+      setCartItems(cartItems.filter(item => item != targetItem))
+    }
+  }
 
   return (
     <>
       <header id="store">
         <h1>Greengrocers</h1>
         <ul className="item-list store--item-list">
-          {/* Write some code here... */}
+          {storeItems.map((storeItem) =>(
+            <li key={storeItem.id}>
+              <div className="store--item-icon">
+                <img src={`/assets/icons/${storeItem.id}.svg`} alt={storeItem.name} />
+              </div>
+            {<button onClick={() => {addToCart({...storeItem, quantity : 1})}}>Add to cart</button>}
+            </li>
+          ))}
         </ul>
       </header>
       <main id="cart">
         <h2>Your Cart</h2>
         <div className="cart--item-list-container">
           <ul className="item-list cart--item-list">
-            {/* Write some code here... */}
+          {cartItems.map((cartItem) =>
+            <li key={cartItem.id}>
+              <img
+              className="cart--item-icon"
+              src={`/assets/icons/${cartItem.id}.svg`}
+              alt={cartItem.name}
+              />
+              <p>{cartItem.name}</p>
+              <button onClick={() => removeFromCart(cartItem)} className="quantity-btn remove-btn center">-</button>
+              <span className="quantity-text center">{cartItem.quantity}</span>
+              <button onClick={() => addToCart(cartItem)} className="quantity-btn add-btn center">+</button>
+            </li>
+          )}
           </ul>
         </div>
         <div className="total-section">
diff --git a/src/store-items.js b/src/store-items.js
index 8e8013c..071ee9e 100644
--- a/src/store-items.js
+++ b/src/store-items.js
@@ -52,4 +52,5 @@ const storeItems =  [
   }
 ]
 
-export default storeItems
\ No newline at end of file
+export default storeItems
+