diff --git a/src/frontend/static/img/products/air-plant.jpg b/src/frontend/static/img/products/air-plant.jpg
new file mode 100644
index 0000000..70a5c91
Binary files /dev/null and b/src/frontend/static/img/products/air-plant.jpg differ
diff --git a/src/frontend/static/img/products/barista-kit.jpg b/src/frontend/static/img/products/barista-kit.jpg
new file mode 100644
index 0000000..29af2bd
Binary files /dev/null and b/src/frontend/static/img/products/barista-kit.jpg differ
diff --git a/src/frontend/static/img/products/camera-lens.jpg b/src/frontend/static/img/products/camera-lens.jpg
new file mode 100644
index 0000000..632a266
Binary files /dev/null and b/src/frontend/static/img/products/camera-lens.jpg differ
diff --git a/src/frontend/static/img/products/camp-mug.jpg b/src/frontend/static/img/products/camp-mug.jpg
new file mode 100644
index 0000000..5fbaed5
Binary files /dev/null and b/src/frontend/static/img/products/camp-mug.jpg differ
diff --git a/src/frontend/static/img/products/city-bike.jpg b/src/frontend/static/img/products/city-bike.jpg
new file mode 100644
index 0000000..3587760
Binary files /dev/null and b/src/frontend/static/img/products/city-bike.jpg differ
diff --git a/src/frontend/static/img/products/credits.txt b/src/frontend/static/img/products/credits.txt
new file mode 100644
index 0000000..bb488c4
--- /dev/null
+++ b/src/frontend/static/img/products/credits.txt
@@ -0,0 +1,9 @@
+film-camera.jpg,CC0 Public Domain,https://pxhere.com/en/photo/829555
+camera-lens.jpg,CC0 Public Domain,https://pxhere.com/en/photo/670041
+air-plant.jpg,,https://unsplash.com/photos/uUwEAW5jFLE
+camp-mug.jpg,,https://unsplash.com/photos/h9VhRlMfVkg
+record-player.jpg,,https://unsplash.com/photos/pEEHFSX1vak
+city-bike.jpg,,https://unsplash.com/photos/Lpe9u9etwMU
+typewriter.jpg,,https://unsplash.com/photos/mk7D-4UCfmg
+barista-kit.jpg,,https://unsplash.com/photos/ZiRyGGIpRCw
+terrarium.jpg,,https://unsplash.com/photos/E9QYLj0724Y
diff --git a/src/frontend/static/img/products/film-camera.jpg b/src/frontend/static/img/products/film-camera.jpg
new file mode 100644
index 0000000..9d78c3f
Binary files /dev/null and b/src/frontend/static/img/products/film-camera.jpg differ
diff --git a/src/frontend/static/img/products/record-player.jpg b/src/frontend/static/img/products/record-player.jpg
new file mode 100644
index 0000000..7080bba
Binary files /dev/null and b/src/frontend/static/img/products/record-player.jpg differ
diff --git a/src/frontend/static/img/products/terrarium.jpg b/src/frontend/static/img/products/terrarium.jpg
new file mode 100644
index 0000000..6477f37
Binary files /dev/null and b/src/frontend/static/img/products/terrarium.jpg differ
diff --git a/src/frontend/static/img/products/typewriter.jpg b/src/frontend/static/img/products/typewriter.jpg
new file mode 100644
index 0000000..a7e7fe5
Binary files /dev/null and b/src/frontend/static/img/products/typewriter.jpg differ
diff --git a/src/productcatalogservice/server.go b/src/productcatalogservice/server.go
index 02d8684..6454f1d 100644
--- a/src/productcatalogservice/server.go
+++ b/src/productcatalogservice/server.go
@@ -17,9 +17,69 @@ import (
 var port = flag.Int("port", 3550, "port to listen at")
 
 var catalog = []*pb.Product{
-	{Id: "1", Name: "shirt", Description: "nice shirt", Picture: "picture1", PriceUsd: &pb.MoneyAmount{Decimal: 53}},
-	{Id: "2", Name: "pants", Description: "nice pants", Picture: "picture2", PriceUsd: &pb.MoneyAmount{Decimal: 81}},
-	{Id: "3", Name: "hat", Description: "nice hat", Picture: "picture3", PriceUsd: &pb.MoneyAmount{Decimal: 20}},
+	{
+		Id:          "12",
+		Name:        "Vintage Typewriter",
+		Description: "This typewriter looks good in your living room.",
+		Picture:     "/static/img/products/typewriter.jpg",
+		PriceUsd:    &pb.MoneyAmount{Decimal: 67, Fractional: 99},
+	},
+	{
+		Id:          "14",
+		Name:        "Vintage Camera Lens",
+		Description: "You won't have a camera to use it and it probably doesn't work anyway.",
+		Picture:     "/static/img/products/camera-lens.jpg",
+		PriceUsd:    &pb.MoneyAmount{Decimal: 12, Fractional: 49},
+	},
+	{
+		Id:          "22",
+		Name:        "Home Barista Kit",
+		Description: "Always wanted to brew coffee with Chemex and Aeropress at home?",
+		Picture:     "/static/img/products/barista-kit.jpg",
+		PriceUsd:    &pb.MoneyAmount{Decimal: 124, Fractional: 0},
+	},
+	{
+		Id:          "56",
+		Name:        "Terrarium",
+		Description: "This terrarium will looks great in your white painted living room.",
+		Picture:     "/static/img/products/terrarium.jpg",
+		PriceUsd:    &pb.MoneyAmount{Decimal: 36, Fractional: 45},
+	},
+	{
+		Id:          "50",
+		Name:        "Film Camera",
+		Description: "This camera looks like it's a film camera, but it's actually digital.",
+		Picture:     "/static/img/products/film-camera.jpg",
+		PriceUsd:    &pb.MoneyAmount{Decimal: 2245, Fractional: 0},
+	},
+	{
+		Id:          "44",
+		Name:        "Vintage Record Player",
+		Description: "It still works.",
+		Picture:     "/static/img/products/record-player.jpg",
+		PriceUsd:    &pb.MoneyAmount{Decimal: 65, Fractional: 50},
+	},
+	{
+		Id:          "52",
+		Name:        "Metal Camping Mug",
+		Description: "You probably don't go camping that often but this is better than plastic cups.",
+		Picture:     "/static/img/products/camp-mug.jpg",
+		PriceUsd:    &pb.MoneyAmount{Decimal: 24, Fractional: 33},
+	},
+	{
+		Id:          "49",
+		Name:        "City Bike",
+		Description: "This single gear bike probably cannot climb the hills of San Francisco.",
+		Picture:     "/static/img/products/city-bike.jpg",
+		PriceUsd:    &pb.MoneyAmount{Decimal: 789, Fractional: 50},
+	},
+	{
+		Id:          "97",
+		Name:        "Air Plant",
+		Description: "Have you ever wondered whether air plants need water? Buy one and figure out.",
+		Picture:     "/static/img/products/air-plant.jpg",
+		PriceUsd:    &pb.MoneyAmount{Decimal: 12, Fractional: 30},
+	},
 }
 
 func main() {