diff --git a/api/src/main.rs b/api/src/main.rs
index 3600bf6..cac331e 100644
--- a/api/src/main.rs
+++ b/api/src/main.rs
@@ -1,5 +1,9 @@
+use std::collections::HashMap;
+
 #[derive(Debug)]
 enum Period {
+    Daily(i32),
+    Weekly(i32),
     Days(i32),
 }
 
@@ -8,21 +12,42 @@ enum ItemUsage {
     Singleton,
     Once,
     Periodic(Period),
+    Infinite,
+}
+
+#[derive(Debug)]
+enum ItemSize {
+    None,
+    Pack(i32),
+    Grams(i32),
 }
 
 #[derive(Debug)]
 struct PackageItem {
     name: String,
+    size: ItemSize,
+    count: i32,
     usage: ItemUsage,
 }
 
 impl PackageItem {
-    fn new(name: String, usage: ItemUsage) -> PackageItem {
+    fn new(name: String, size: ItemSize, count: i32, usage: ItemUsage) -> PackageItem {
         PackageItem {
             name: name,
+            size: size,
+            count: count,
             usage: usage,
         }
     }
+
+    fn new_simple(name: String) -> PackageItem {
+        PackageItem {
+            name: name,
+            size: ItemSize::None,
+            count: 1,
+            usage: ItemUsage::Singleton,
+        }
+    }
 }
 
 #[derive(Debug)]
@@ -39,18 +64,22 @@ struct TripItem<'a> {
 }
 
 impl TripItem<'_> {
-    fn from_package_item(package_item: &PackageItem) -> TripItem  {
+    fn from_package_item(package_item: &PackageItem) -> TripItem {
         TripItem {
             package_item: package_item,
             status: TripItemStatus::Pending,
         }
     }
+
+    fn set_status(&mut self, status: TripItemStatus) {
+        self.status = status;
+    }
 }
 
 #[derive(Debug)]
 struct PackageList {
     name: String,
-    items: Vec<PackageItem>,
+    items: HashMap<String, PackageItem>,
 }
 
 #[derive(Debug)]
@@ -60,10 +89,12 @@ struct TripList<'a> {
 
 impl<'a> TripList<'a> {
     fn from_package_list(list: &'a PackageList) -> TripList<'a> {
-        TripList {
-            items: vec![TripItem::from_package_item(&list.items[0])],
+        let mut items = Vec::new();
+        for (_, item) in &list.items {
+            items.push(TripItem::from_package_item(item));
         }
 
+        TripList { items: items }
     }
 }
 
@@ -85,26 +116,214 @@ impl<'a> Trip<'a> {
 }
 
 fn main() {
+    let items = vec![
+        // Base
+        PackageItem::new_simple(String::from("Rucksack")),
+        PackageItem::new_simple(String::from("Regenhülle für Rucksack")),
+        PackageItem::new_simple(String::from("Normale Schuhe")),
+        //
+        // Geld & Karten
+        PackageItem::new_simple(String::from("Geld")),
+        PackageItem::new_simple(String::from("Kreditkarte")),
+        PackageItem::new_simple(String::from("Pass")),
+        PackageItem::new_simple(String::from("Krankenversicherungskarte")),
+        PackageItem::new_simple(String::from("Krankenversicherungskarte (Zusatz)")),
+        PackageItem::new_simple(String::from("Auslandskrankenversicherungsnachweis")),
+        PackageItem::new_simple(String::from("ADAC-Karte")),
+        PackageItem::new_simple(String::from("Impfausweiß (EU)")),
+        PackageItem::new_simple(String::from("Führerschein")),
+        PackageItem::new_simple(String::from("Internationaler Führerschein")),
+        //
+        // Waschzeug
+        PackageItem::new_simple(String::from("Waschbeutel")),
+        PackageItem::new_simple(String::from("Sonnencreme")),
+        PackageItem::new_simple(String::from("After-Sun")),
+        PackageItem::new_simple(String::from("Nagelset")),
+        PackageItem::new_simple(String::from("Rasurbox")),
+        PackageItem::new_simple(String::from("Rasierer")),
+        PackageItem::new(
+            String::from("Ersatzklingen"),
+            ItemSize::Pack(1),
+            1,
+            ItemUsage::Infinite,
+        ),
+        PackageItem::new_simple(String::from("Zahnbürste")),
+        PackageItem::new(
+            String::from("Zahnputztabletten"),
+            ItemSize::None,
+            1,
+            ItemUsage::Periodic(Period::Daily(2)),
+        ),
+        PackageItem::new_simple(String::from("Deo")),
+        PackageItem::new_simple(String::from("Duschgel / Shampoo")),
+        //
+        // Apotheke
+        PackageItem::new(
+            String::from("Blasenpflaster"),
+            ItemSize::Pack(1),
+            1,
+            ItemUsage::Infinite,
+        ),
+        PackageItem::new(
+            String::from("Erste-Hilfe-Set"),
+            ItemSize::None,
+            1,
+            ItemUsage::Infinite,
+        ),
+        PackageItem::new(
+            String::from("Paracetamol"),
+            ItemSize::Pack(1),
+            1,
+            ItemUsage::Infinite,
+        ),
+        PackageItem::new(
+            String::from("Autan"),
+            ItemSize::Pack(1),
+            1,
+            ItemUsage::Infinite,
+        ),
+        PackageItem::new(
+            String::from("Pflaster"),
+            ItemSize::Pack(1),
+            1,
+            ItemUsage::Infinite,
+        ),
+        PackageItem::new(
+            String::from("Zeckenkarte"),
+            ItemSize::None,
+            1,
+            ItemUsage::Singleton,
+        ),
+        //
+        // Badesachen
+        PackageItem::new_simple(String::from("Badehose")),
+        PackageItem::new_simple(String::from("Badehandtuch")),
+        PackageItem::new_simple(String::from("Surfshirt (Lang)")),
+        PackageItem::new_simple(String::from("Wasserschuhe")),
+        //
+        // Camping
+        PackageItem::new_simple(String::from("Schlafsack")),
+        PackageItem::new_simple(String::from("Zelt")),
+        PackageItem::new_simple(String::from("Luftmatratze")),
+        PackageItem::new_simple(String::from("Campingstuhl")),
+        PackageItem::new_simple(String::from("Topf")),
+        PackageItem::new_simple(String::from("Teller")),
+        PackageItem::new_simple(String::from("Messer")),
+        PackageItem::new_simple(String::from("Gabel")),
+        PackageItem::new_simple(String::from("Löffel")),
+        PackageItem::new_simple(String::from("Stirnlampe")),
+        PackageItem::new_simple(String::from("Taschenlampe")),
+        PackageItem::new_simple(String::from("Feuerzeug")),
+        PackageItem::new_simple(String::from("Tasse")),
+        PackageItem::new_simple(String::from("Grill")),
+        PackageItem::new(
+            String::from("Grillkohle"),
+            ItemSize::Grams(1500),
+            1,
+            ItemUsage::Periodic(Period::Days(2)),
+        ),
+        PackageItem::new_simple(String::from("Campingkocher")),
+        PackageItem::new(
+            String::from("Campinggas"),
+            ItemSize::Pack(1),
+            1,
+            ItemUsage::Periodic(Period::Days(3)),
+        ),
+        PackageItem::new_simple(String::from("Kaffeekochaufsatz")),
+        PackageItem::new(
+            String::from("Küchenrolle"),
+            ItemSize::None,
+            1,
+            ItemUsage::Periodic(Period::Days(5)),
+        ),
+        PackageItem::new(
+            String::from("Müllsäcke"),
+            ItemSize::Pack(1),
+            1,
+            ItemUsage::Infinite,
+        ),
+        //
+        // Essen
+        PackageItem::new(
+            String::from("Kaffee"),
+            ItemSize::Grams(100),
+            1,
+            ItemUsage::Periodic(Period::Days(3)),
+        ),
+        //
+        // Wanderzeug
+        PackageItem::new_simple(String::from("Wanderschuhe")),
+        PackageItem::new_simple(String::from("Trinkblase")),
+        //
+        // Klamotten
+        PackageItem::new(String::from("Cap"), ItemSize::None, 1, ItemUsage::Singleton),
+        PackageItem::new(
+            String::from("Regenjacke"),
+            ItemSize::None,
+            1,
+            ItemUsage::Singleton,
+        ),
+        PackageItem::new(
+            String::from("Daunenjacke"),
+            ItemSize::None,
+            1,
+            ItemUsage::Singleton,
+        ),
+        PackageItem::new(
+            String::from("Pullover"),
+            ItemSize::None,
+            1,
+            ItemUsage::Singleton,
+        ),
+        PackageItem::new(
+            String::from("Lange Hose"),
+            ItemSize::None,
+            2,
+            ItemUsage::Singleton,
+        ),
+        PackageItem::new(
+            String::from("Kurze Hose"),
+            ItemSize::None,
+            1,
+            ItemUsage::Singleton,
+        ),
+        PackageItem::new(
+            String::from("Jogginghose"),
+            ItemSize::None,
+            1,
+            ItemUsage::Singleton,
+        ),
+        PackageItem::new(
+            String::from("Socken"),
+            ItemSize::None,
+            1,
+            ItemUsage::Periodic(Period::Daily(1)),
+        ),
+        PackageItem::new(
+            String::from("Unterhose"),
+            ItemSize::None,
+            1,
+            ItemUsage::Periodic(Period::Daily(1)),
+        ),
+        PackageItem::new(
+            String::from("T-Shirt"),
+            ItemSize::None,
+            1,
+            ItemUsage::Periodic(Period::Days(2)),
+        ),
+        //
+        // Misc
+        PackageItem::new_simple(String::from("Trinkflasche")),
+        PackageItem::new_simple(String::from("Ladegerät")),
+        PackageItem::new_simple(String::from("Powerbank")),
+        PackageItem::new_simple(String::from("Ersatzbrille")),
+        PackageItem::new_simple(String::from("Sonnenbrille")),
+        PackageItem::new_simple(String::from("Ohrenstöpsel")),
+    ];
+
     let package_list_camping = PackageList {
         name: String::from("camping"),
-        items: vec![
-            PackageItem::new(String::from("Rucksack"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Schlafsack"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Zelt"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Luftmatratze"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Campingstuhl"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Regenjacke"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Tasse"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Trinkblase"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Trinkflasche"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Topf"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Messer"), ItemUsage::Singleton),
-            PackageItem::new(String::from("Messer"), ItemUsage::Singleton),
-            PackageItem::new(
-                String::from("Unterhose"),
-                ItemUsage::Periodic(Period::Days(1)),
-            ),
-        ],
+        items: (0..items.len()).map(|i| i.to_string()).zip(items).collect(),
     };
 
     println!("Contents of package list {:?}:", package_list_camping.name);
@@ -112,15 +331,24 @@ fn main() {
         println!("{:?}", item);
     }
 
-    println!("Now we're starting an actual trip!");
+    println!("\nNow we're starting an actual trip!");
 
-    let trip = Trip::from_package_list(
+    let mut trip = Trip::from_package_list(
         String::from("Campingtrip"),
         String::from("2021-09-06"),
         &package_list_camping,
     );
 
-    println!("Package list for trip {:?} at {:?}:", trip.name, trip.date);
+    println!(
+        "\nPackage list for trip {:?} at {:?}:",
+        trip.name, trip.date
+    );
+    for item in &trip.list.items {
+        println!("{:?}", item);
+    }
+
+    trip.list.items[0].set_status(TripItemStatus::Ready);
+    trip.list.items[1].set_status(TripItemStatus::Packed);
     for item in &trip.list.items {
         println!("{:?}", item);
     }