diff --git a/src/App.js b/src/App.js
index e134ca03..ed684b59 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,6 +2,10 @@ import React, { useState } from 'react';
 import { Route } from 'react-router-dom';
 import data from './data';
 
+
+import ProductContext from './components/Context/ProductContext';
+import CartContext from './components/Context/CartContext';
+
 // Components
 import Navigation from './components/Navigation';
 import Products from './components/Products';
@@ -12,21 +16,26 @@ function App() {
 	const [cart, setCart] = useState([]);
 
 	const addItem = item => {
-		// add the given item to the cart
+		setCart([...cart, item]);
+
 	};
 
 	return (
 		<div className="App">
-			<Navigation cart={cart} />
+			<CartContext.Provider value={cart}>
+				<Navigation />
 
-			{/* Routes */}
-			<Route exact path="/">
-				<Products products={products} addItem={addItem} />
-			</Route>
+				{/* Routes */}
+				<ProductContext.Provider value={{ products, addItem }}>
+					<Route exact path="/">
+						<Products />
+					</Route>
+				</ProductContext.Provider>
 
-			<Route path="/cart">
-				<ShoppingCart cart={cart} />
-			</Route>
+				<Route path="/cart">
+					<ShoppingCart />
+				</Route>
+			</CartContext.Provider>
 		</div>
 	);
 }
diff --git a/src/components/Context/CartContext.js b/src/components/Context/CartContext.js
new file mode 100644
index 00000000..c1bfac69
--- /dev/null
+++ b/src/components/Context/CartContext.js
@@ -0,0 +1,5 @@
+import { createContext } from "react";
+
+const CartContext = createContext();
+
+export default CartContext;
\ No newline at end of file
diff --git a/src/components/Context/ProductContext.js b/src/components/Context/ProductContext.js
new file mode 100644
index 00000000..611ccbdb
--- /dev/null
+++ b/src/components/Context/ProductContext.js
@@ -0,0 +1,5 @@
+import { createContext } from "react";
+
+const ProductContext = createContext();
+
+export default ProductContext;
\ No newline at end of file
diff --git a/src/components/Navigation.js b/src/components/Navigation.js
index b2ef658a..ea015e8a 100644
--- a/src/components/Navigation.js
+++ b/src/components/Navigation.js
@@ -1,12 +1,15 @@
-import React from 'react';
+import React, {useContext } from 'react';
 import { NavLink } from 'react-router-dom';
 
+import CartContext from './Context/CartContext';
+
 const Navigation = props => {
-	return (
+	const cart = useContext(CartContext);
+		return (
 		<div className="navigation">
 			<NavLink to="/">Products</NavLink>
 			<NavLink to="/cart">
-				Cart <span>{props.cart.length}</span>
+				Cart <span>{cart.length}</span>
 			</NavLink>
 		</div>
 	);
diff --git a/src/components/Product.js b/src/components/Product.js
index 8c9b860b..f3698026 100644
--- a/src/components/Product.js
+++ b/src/components/Product.js
@@ -1,6 +1,9 @@
-import React from 'react';
+import React, { useContext } from 'react';
+
+import ProductContext from './Context/ProductContext';
 
 const Product = props => {
+	const {addItem} = useContext(ProductContext);
 	return (
 		<div className="product">
 			<img src={props.product.image} alt={`${props.product.title} book`} />
@@ -9,7 +12,7 @@ const Product = props => {
 
 			<p className="price">${props.product.price}</p>
 
-			<button onClick={() => props.addItem(props.product)}>
+			<button onClick={() => addItem(props.product)}>
 				Add to cart
 			</button>
 		</div>
diff --git a/src/components/Products.js b/src/components/Products.js
index 3f56b80e..964b79c1 100644
--- a/src/components/Products.js
+++ b/src/components/Products.js
@@ -1,16 +1,18 @@
-import React from 'react';
+import React, { useContext } from 'react';
+
+import ProductContext from './Context/ProductContext';
 
 // Components
 import Product from './Product';
 
 const Products = props => {
+	const { products } = useContext(ProductContext);
 	return (
 		<div className="products-container">
-			{props.products.map(product => (
+			{products.map(product => (
 				<Product
 					key={product.id}
 					product={product}
-					addItem={props.addItem}
 				/>
 			))}
 		</div>
diff --git a/src/components/ShoppingCart.js b/src/components/ShoppingCart.js
index a2d21939..492eae24 100644
--- a/src/components/ShoppingCart.js
+++ b/src/components/ShoppingCart.js
@@ -1,18 +1,21 @@
-import React from 'react';
+import React, {useContext } from 'react';
+
+import CartContext from './Context/CartContext';
 
 // Components
 import Item from './ShoppingCartItem';
 
 const ShoppingCart = props => {
+	const cart = useContext(CartContext);
 	const getCartTotal = () => {
-		return props.cart.reduce((acc, value) => {
+		return cart.reduce((acc, value) => {
 			return acc + value.price;
 		}, 0).toFixed(2);
 	};
 
 	return (
 		<div className="shopping-cart">
-			{props.cart.map(item => (
+			{cart.map(item => (
 				<Item key={item.id} {...item} />
 			))}