diff --git a/02_activities/assignments/Assignment2.md b/02_activities/assignments/Assignment2.md
index 6cc76d916..f54c3f47b 100644
--- a/02_activities/assignments/Assignment2.md
+++ b/02_activities/assignments/Assignment2.md
@@ -54,7 +54,7 @@ The store wants to keep customer addresses. Propose two architectures for the CU
 **HINT:** search type 1 vs type 2 slowly changing dimensions. 
 
 ```
-Your answer...
+Your answer..Type 1 is only cares about the current data so it will overwrite.Type 2 will keep the history and retain changes
 ```
 
 ***
diff --git a/02_activities/assignments/assignment1.sql b/02_activities/assignments/assignment1.sql
index 2e89fa7af..78208c6be 100644
--- a/02_activities/assignments/assignment1.sql
+++ b/02_activities/assignments/assignment1.sql
@@ -5,20 +5,28 @@
 --SELECT
 /* 1. Write a query that returns everything in the customer table. */
 
-
+select * 
+FROM customer ;
 
 /* 2. Write a query that displays all of the columns and 10 rows from the cus- tomer table, 
 sorted by customer_last_name, then customer_first_ name. */
-
+SELECT *
+FROM customer 
+ORDER BY customer_last_name,customer_first_name
+LIMIT 10;
 
 
 --WHERE
 /* 1. Write a query that returns all customer purchases of product IDs 4 and 9. */
 -- option 1
-
+SELECT *
+FROM customer_purchases
+WHERE product_id =4 OR product_id =9;
 
 -- option 2
-
+SELECT *
+FROM customer_purchases
+WHERE product_id IN (4,9);
 
 
 /*2. Write a query that returns all customer purchases and a new calculated column 'price' (quantity * cost_to_customer_per_qty), 
@@ -27,10 +35,15 @@ filtered by vendor IDs between 8 and 10 (inclusive) using either:
 	2.  one condition using BETWEEN
 */
 -- option 1
-
-
+SELECT *
+,quantity * cost_to_customer_per_qty as price
+FROM customer_purchases
+where vendor_id >=8 AND vendor_id <=10;
 -- option 2
-
+SELECT *
+,quantity * cost_to_customer_per_qty as price
+FROM customer_purchases
+where vendor_id BETWEEN 8 AND 10;
 
 
 --CASE
@@ -38,19 +51,36 @@ filtered by vendor IDs between 8 and 10 (inclusive) using either:
 Using the product table, write a query that outputs the product_id and product_name
 columns and add a column called prod_qty_type_condensed that displays the word “unit” 
 if the product_qty_type is “unit,” and otherwise displays the word “bulk.” */
-
+SELECT product_id, product_name
+,CASE WHEN product_qty_type = 'unit' THEN 'unit'
+ELSE 'bulk' END AS product_qty_type_condensed
+FROM product;
 
 
 /* 2. We want to flag all of the different types of pepper products that are sold at the market. 
 add a column to the previous query called pepper_flag that outputs a 1 if the product_name 
 contains the word “pepper” (regardless of capitalization), and otherwise outputs 0. */
 
+SELECT product_id, product_name
+
+,CASE WHEN product_qty_type = 'unit' THEN 'unit'
+ELSE 'bulk' END AS product_qty_type_condensed,
+
+CASE WHEN product_name like '%pepper%' THEN 1
+ELSE 0 END AS pepper_flag
+
+FROM product;
+
 
 
 --JOIN
 /* 1. Write a query that INNER JOINs the vendor table to the vendor_booth_assignments table on the 
 vendor_id field they both have in common, and sorts the result by vendor_name, then market_date. */
-
+SELECT *
+FROM vendor as v
+INNER JOIN vendor_booth_assignments as vba
+ON v.vendor_id = vba.vendor_id
+ORDER BY vendor_name, market_date;
 
 
 
@@ -60,6 +90,11 @@ vendor_id field they both have in common, and sorts the result by vendor_name, t
 /* 1. Write a query that determines how many times each vendor has rented a booth 
 at the farmer’s market by counting the vendor booth assignments per vendor_id. */
 
+SELECT vendor_id
+,COUNT (booth_number)
+FROM vendor_booth_assignments
+GROUP BY booth_number;
+
 
 
 /* 2. The Farmer’s Market Customer Appreciation Committee wants to give a bumper 
@@ -68,7 +103,12 @@ of customers for them to give stickers to, sorted by last name, then first name.
 
 HINT: This query requires you to join two tables, use an aggregate function, and use the HAVING keyword. */
 
-
+SELECT c.customer_first_name, c.customer_last_name
+,sum(cp.quantity*cp.cost_to_customer_per_qty) as spent
+FROM customer as c
+INNER JOIN customer_purchases as cp ON c.customer_id = cp.customer_id
+GROUP BY c.customer_first_name, c.customer_last_name
+HAVING spent > 2000;
 
 --Temp Table
 /* 1. Insert the original vendor table into a temp.new_vendor and then add a 10th vendor: 
@@ -81,7 +121,12 @@ When inserting the new vendor, you need to appropriately align the columns to be
 -> To insert the new row use VALUES, specifying the value you want for each column:
 VALUES(col1,col2,col3,col4,col5) 
 */
+CREATE TABLE temp.new_vendor AS
+SELECT * 
+FROM vendor;
 
+INSERT INTO new_vendor
+VALUES(10, 'Thomass Superfood Store', 'a Fresh Focused store', 'Thomas', 'Rosenthal');
 
 
 -- Date
diff --git a/02_activities/assignments/assignment2.sql b/02_activities/assignments/assignment2.sql
index 5ad40748a..dac6bc1aa 100644
--- a/02_activities/assignments/assignment2.sql
+++ b/02_activities/assignments/assignment2.sql
@@ -21,6 +21,10 @@ Edit the appropriate columns -- you're making two edits -- and the NULL rows wil
 All the other rows will remain the same.) */
 
 
+SELECT 
+product_name || ', ' || coalesce(product_size,"")|| ' (' || coalesce(product_qty_type,"") || ')'
+FROM product
+
 
 --Windowed Functions
 /* 1. Write a query that selects from the customer_purchases table and numbers each customer’s  
@@ -32,17 +36,29 @@ each new market date for each customer, or select only the unique market dates p
 (without purchase details) and number those visits. 
 HINT: One of these approaches uses ROW_NUMBER() and one uses DENSE_RANK(). */
 
-
+select customer_id,market_date
+,dense_rank() over (PARTITION by customer_id order by market_date) as visit
+from customer_purchases
 
 /* 2. Reverse the numbering of the query from a part so each customer’s most recent visit is labeled 1, 
 then write another query that uses this one as a subquery (or temp table) and filters the results to 
 only the customer’s most recent visit. */
-
-
+SELECT DISTINCT customer_id,market_date,recent_visit
+FROM(
+select customer_id,market_date
+,dense_rank() over (PARTITION by customer_id order by market_date DESC) as recent_visit
+from customer_purchases)
+WHERE recent_visit =1;
 
 /* 3. Using a COUNT() window function, include a value along with each row of the 
 customer_purchases table that indicates how many different times that customer has purchased that product_id. */
 
+SELECT distinct customer_id,product_id,purchase_qty
+FROM(
+select customer_id,product_id
+,count() over (PARTITION by customer_id,product_id order by product_id) as purchase_qty
+from customer_purchases)
+
 
 
 -- String manipulations
@@ -57,10 +73,16 @@ Remove any trailing or leading whitespaces. Don't just use a case statement for
 
 Hint: you might need to use INSTR(product_name,'-') to find the hyphens. INSTR will help split the column. */
 
+SELECT product_name,
+  CASE WHEN INSTR(product_name, '-') > 0 THEN TRIM(SUBSTR(product_name, INSTR(product_name, '-') + 1)) 
+    ELSE NULL END AS description FROM product;
 
 
 /* 2. Filter the query to show any product_size value that contain a number with REGEXP. */
 
+SELECT product_size
+From product 
+WHERE product_size REGEXP '?';
 
 
 -- UNION
@@ -73,7 +95,21 @@ HINT: There are a possibly a few ways to do this query, but if you're struggling
 3) Query the second temp table twice, once for the best day, once for the worst day, 
 with a UNION binding them. */
 
-
+SELECT market_date, total_sales
+FROM (SELECT market_date,
+        SUM(quantity*cost_to_customer_per_qty) AS total_sales
+    FROM customer_purchases
+    GROUP BY market_date
+    ORDER BY total_sales DESC
+    LIMIT 1) AS best_day
+UNION
+SELECT market_date, total_sales
+FROM (SELECT market_date,
+        SUM(quantity*cost_to_customer_per_qty) AS total_sales
+    FROM customer_purchases
+    GROUP BY market_date
+    ORDER BY total_sales ASC
+    LIMIT 1) AS best_day
 
 
 /* SECTION 3 */
@@ -89,6 +125,13 @@ Think a bit about the row counts: how many distinct vendors, product names are t
 How many customers are there (y). 
 Before your final group by you should have the product of those two queries (x*y).  */
 
+SELECT Distinct v.vendor_name,p.product_name,( vi.original_price * c.ccount*5) AS total_sales
+FROM vendor_inventory vi
+JOIN vendor v ON vi.vendor_id = v.vendor_id
+JOIN product p ON vi.product_id = p.product_id
+CROSS JOIN (
+    SELECT COUNT(*) AS ccount
+    FROM customer) c;
 
 
 -- INSERT
@@ -97,11 +140,17 @@ This table will contain only products where the `product_qty_type = 'unit'`.
 It should use all of the columns from the product table, as well as a new column for the `CURRENT_TIMESTAMP`.  
 Name the timestamp column `snapshot_timestamp`. */
 
+CREATE TABLE product_units AS 
+SELECT product_id,product_name,product_size,product_category_id,product_qty_type,CURRENT_TIMESTAMP AS snapshot_timestamp
+FROM product
+WHERE product.product_qty_type = 'unit';
 
 
 /*2. Using `INSERT`, add a new row to the product_units table (with an updated timestamp). 
 This can be any product you desire (e.g. add another record for Apple Pie). */
 
+INSERT INTO product_units (product_id,product_name,product_size,product_category_id,product_qty_type,snapshot_timestamp)
+VALUES (24, 'Apple Pie', '6"',1,'unit',CURRENT_TIMESTAMP);
 
 
 -- DELETE
@@ -109,6 +158,8 @@ This can be any product you desire (e.g. add another record for Apple Pie). */
 
 HINT: If you don't specify a WHERE clause, you are going to have a bad time.*/
 
+DELETE FROM product_units
+WHERE product_id = 24;
 
 
 -- UPDATE
@@ -128,6 +179,14 @@ Finally, make sure you have a WHERE statement to update the right row,
 	you'll need to use product_units.product_id to refer to the correct row within the product_units table. 
 When you have all of these components, you can run the update statement. */
 
+ALTER TABLE product_units
+ADD current_quantity INT;
 
-
-
+UPDATE product_units
+SET current_quantity = COALESCE(
+    (SELECT vendor_inventory.quantity
+     FROM vendor_inventory 
+     WHERE vendor_inventory.product_id = product_units.product_id
+     ORDER BY vendor_inventory.market_date DESC
+     LIMIT 1), 0)
+WHERE product_units.product_id IS NOT NULL;
\ No newline at end of file
diff --git a/02_activities/assignments/images/Assignment-2.png b/02_activities/assignments/images/Assignment-2.png
new file mode 100644
index 000000000..310fc498d
Binary files /dev/null and b/02_activities/assignments/images/Assignment-2.png differ
diff --git a/02_activities/assignments/images/Product&CustomerPurchase&Customer Diagram.png b/02_activities/assignments/images/Product&CustomerPurchase&Customer Diagram.png
new file mode 100644
index 000000000..bc486af89
Binary files /dev/null and b/02_activities/assignments/images/Product&CustomerPurchase&Customer Diagram.png differ
diff --git a/02_activities/assignments/images/farmersmarket.db b/02_activities/assignments/images/farmersmarket.db
new file mode 100644
index 000000000..4720f2483
Binary files /dev/null and b/02_activities/assignments/images/farmersmarket.db differ
diff --git a/02_activities/assignments/images/farmersmarket.db-journal b/02_activities/assignments/images/farmersmarket.db-journal
new file mode 100644
index 000000000..9dd754e0a
Binary files /dev/null and b/02_activities/assignments/images/farmersmarket.db-journal differ
diff --git a/05_src/sql/farmersmarket.db-journal b/05_src/sql/farmersmarket.db-journal
new file mode 100644
index 000000000..54ae784d8
Binary files /dev/null and b/05_src/sql/farmersmarket.db-journal differ