diff --git a/src/components/ListSection.vue b/src/components/ListSection.vue
index b7ea7b4..a6e4210 100644
--- a/src/components/ListSection.vue
+++ b/src/components/ListSection.vue
@@ -439,18 +439,11 @@ export default defineComponent({
   }
 
   button {
-    font-size: 0.9em;
-    padding: 0.4em 0.55em;
     margin-right: 0.5em;
 
     &:nth-child(5) {
       margin-right: 0;
     }
-
-    &:focus-visible {
-      color: $accentColor;
-      border-color: $accentColor;
-    }
   }
 }
 
diff --git a/src/components/RandomizerCard.vue b/src/components/RandomizerCard.vue
index e33f478..c991676 100644
--- a/src/components/RandomizerCard.vue
+++ b/src/components/RandomizerCard.vue
@@ -20,7 +20,8 @@
         <div class="select-box locos">
           <h3>LOKOMOTYWA</h3>
 
-          <select>
+          <select v-model="chosenLocomotive">
+            <option :value="undefined">Wybierz lokomotywę</option>
             <option v-for="loco in store.locoDataList.filter((l) => !l.type.includes('EN'))" :value="loco">
               {{ loco.type }}
             </option>
@@ -30,30 +31,70 @@
         <div class="select-box carwagons">
           <h3>WAGONY</h3>
 
-          <ul class="carwagons-list">
-            <li v-for="stockWagon in chosenCarWagonList">
-              <select class="select-type" v-model="stockWagon.wagon">
-                <option :value="car" v-for="car in store.carDataList">{{ car.type }}</option>
-              </select>
+          <div class="rules">
+            <button v-if="showRules" class="btn btn--outline" style="margin-bottom: 0.5em" @click="showRules = false">
+              Ukryj zasady dodawania wagonów
+            </button>
 
-              <select class="select-cargo">
-                <option value="empty" v-if="stockWagon.wagon.cargoList.length > 0">próżny</option>
-                <option value="empty" v-if="stockWagon.wagon.cargoList.length > 0">ładowny</option>
-                <option value="empty" v-if="stockWagon.wagon.cargoList.length > 0">losowo</option>
-                <option value="test" v-for="cargo in stockWagon.wagon.cargoList">{{ cargo.id }}</option>
+            <button v-else class="btn btn--outline" @click="showRules = true">Pokaż zasady dodawania wagonów</button>
+
+            <ul v-if="showRules" class="rules-list">
+              <li>
+                nazwy wagonów w pierwszym polu muszą zaczynać się typem konstrukcyjnym (np. <i>111a</i> lub
+                <i>203V</i>), wariantem np. <i>111a Grafitti 1</i> lub jego początkiem, np. <i>111a PKPIC</i> (wtedy
+                losowanie obejmuje wszystkie dostępne wagony o takim początku)
+              </li>
+              <li>
+                ładunki w drugim polu można wybrać po uprzednim wpisaniu typu konstrukcyjnego wagonu towarowego
+                (zakładając, że je posiada)
+              </li>
+              <li>
+                liczba na trzecim polu - domyślnie 10 - to waga (szansa) wylosowania wagonu. Im większa waga, tym
+                większe prawdopodobieństwo
+              </li>
+              <li>liczba wariantów obejmująca losowanie danego wagonu pokazana jest na końcu rzędu</li>
+            </ul>
+          </div>
+
+          <ul class="carwagon-list">
+            <li v-for="(stockWagon, i) in chosenCarWagonList">
+              <input
+                class="carwagon-type g-input"
+                type="text"
+                list="types-datalist"
+                v-model="stockWagon.stockString"
+                @input="onCarWagonTypeInput(stockWagon)"
+              />
+
+              <datalist id="types-datalist">
+                <option v-for="carOptionType in allCarOptionsList" :value="carOptionType">{{ carOptionType }}</option>
+              </datalist>
+
+              <select class="carwagon-cargo" v-model="stockWagon.chosenCargo">
+                <option :value="undefined">bez ładunku</option>
+
+                <option value="random" v-if="stockWagon.availableCargo && stockWagon.availableCargo.length > 0">
+                  losowo
+                </option>
+
+                <option v-for="cargo in stockWagon.availableCargo" :value="cargo">
+                  {{ cargo.id }}
+                </option>
               </select>
 
               <span class="carwagon-chance">
                 <input type="number" v-model="stockWagon.chance" max="100" min="1" />
               </span>
+
+              <div>Warianty: {{ stockWagon.availableCars.length }}</div>
             </li>
           </ul>
 
-          <button class="btn" @click="addCarWagon">+ DODAJ NOWY WAGON</button>
+          <button class="btn btn--outline" @click="addCarWagon">+ DODAJ NOWY WAGON</button>
         </div>
       </div>
 
-      <button class="btn" style="font-size: 1.15em; margin-top: 2em" @click="() => {}">LOSUJ SKŁAD!</button>
+      <button class="btn" style="font-size: 1.15em; margin-top: 2em" @click="generateRandomStock">LOSUJ SKŁAD!</button>
       <button class="btn" style="font-size: 1.15em; margin-top: 2em" @click="store.isRandomizerCardOpen = false">
         ZAMKNIJ
       </button>
@@ -64,13 +105,18 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 
-import { ICarWagon, ILocomotive, ICargo, IStock } from '../types';
+import { ICargo, ICarWagon, ILocomotive, IStock, IVehicleData } from '../types';
 
 import { useStore } from '../store';
+import stockMixin from '../mixins/stockMixin';
 
 interface RandomStockCarWagon {
-  wagon: ICarWagon;
+  stockString: string;
   chance: number;
+
+  availableCars: ICarWagon[];
+  availableCargo?: ICargo[];
+  chosenCargo?: ICargo;
 }
 
 export default defineComponent({
@@ -82,6 +128,8 @@ export default defineComponent({
     };
   },
 
+  mixins: [stockMixin],
+
   activated() {
     (this.$refs['cardWrapper'] as any).focus();
   },
@@ -93,66 +141,128 @@ export default defineComponent({
     chosenCarWagonList: [] as RandomStockCarWagon[],
     chosenLocomotive: undefined as ILocomotive | undefined,
 
-    // chosenCarTypes: [] as string[],
-
-    // cargoFillModeList: [
-    //   {
-    //     id: 'cargo-random',
-    //     value: 'LOSOWO',
-    //   },
-    //   {
-    //     id: 'cargo-filled',
-    //     value: 'ŁADOWNE',
-    //   },
-    //   {
-    //     id: 'cargo-empty',
-    //     value: 'PRÓŻNE',
-    //   },
-    // ] as { id: CargoFillModeType; value: string }[],
-
-    // chosenCargoFillMode: 'cargo-random' as CargoFillModeType,
-
-    // icons: {
-    //   randomize: randomizeIcon,
-    // },
-
-    // focusedCar: null as ICarWagon | null,
+    showRules: false,
     // isPreviewLoading: false,
-
-    // cargoTypes: [
-    //   '203V',
-    //   '208Kf',
-    //   '209c',
-    //   '29R',
-    //   '304C',
-    //   '304Ca',
-    //   '401Ka',
-    //   '401Zb',
-    //   '408S',
-    //   '412W',
-    //   '412Z',
-    //   '424Z',
-    //   '426S',
-    //   '429W',
-    //   '441V',
-    //   '504a',
-    //   '612a',
-    //   '627Z',
-    // ],
-
-    // carUsage: carUsage as { [key: string]: string },
   }),
 
+  computed: {
+    allCarOptionsList() {
+      const list: string[] = [];
+
+      this.store.carDataList.forEach((carData) => {
+        const splittedTypeList = carData.type.split('_');
+
+        for (let i = 0; i < splittedTypeList.length; i++) {
+          const typeToCheck = carData.type
+            .split('_', i + 1)
+            .join('_')
+            .replace(/_/g, ' ');
+
+          if (!list.includes(typeToCheck)) list.push(typeToCheck);
+        }
+      });
+
+      return list.sort((a, b) => a > b ? 1 : -1);
+    },
+  },
+
   methods: {
+    onCarWagonTypeInput(carWagon: RandomStockCarWagon) {
+      const constructionType = carWagon.stockString.split(' ')[0];
+
+      const carWagonObj = this.store.carDataList.find((car) => car.constructionType == constructionType);
+
+      const allAvailableCars = this.store.carDataList.filter((car) =>
+        car.type.startsWith(carWagon.stockString.replace(/ /g, '_'))
+      );
+
+      carWagon.availableCars = allAvailableCars;
+      carWagon.availableCargo = carWagonObj?.cargoList || undefined;
+
+      if (!carWagonObj?.cargoList) {
+        carWagon.chosenCargo = undefined;
+      }
+    },
+
     addCarWagon() {
       const randomStockCarWagon: RandomStockCarWagon = {
-        chance: 100,
-        wagon: this.store.carDataList[0],
+        stockString: '111a PKPIC',
+        chance: 10,
+        chosenCargo: undefined,
+        availableCargo: undefined,
+        availableCars: this.store.carDataList.filter((car) => car.type.startsWith('111a_PKPIC')),
       };
 
       this.chosenCarWagonList.push(randomStockCarWagon);
     },
 
+    generateRandomStock() {
+      let totalLength = 0;
+      let totalMass = 0;
+
+      let generatedStockList: IStock[] = [];
+
+      // if (!this.chosenLocomotive) return;
+      if (this.chosenCarWagonList.length == 0) return;
+
+      // generatedStockList.push(this.getStockObject(this.chosenLocomotive));
+      // totalLength += this.chosenLocomotive.length;
+      // totalMass += this.chosenLocomotive.mass;
+
+      while (generatedStockList.length < 25) {
+        const randCarWagon = this.getRandomCarWagon();
+
+        generatedStockList.push(this.getStockObject(randCarWagon));
+
+        totalLength += randCarWagon.length;
+        totalMass += randCarWagon.mass;
+      }
+
+      console.log(generatedStockList);
+    },
+
+    getRandomCarWagon(): ICarWagon {
+      const totalChancePot = this.chosenCarWagonList.reduce((total, car) => {
+        total += car.chance;
+        return total;
+      }, 0);
+
+      let rand = Math.random() * totalChancePot;
+      let randCarWagon: ICarWagon | undefined = undefined;
+
+      for (let wagonItem of this.chosenCarWagonList) {
+        if (rand < wagonItem.chance) {
+          randCarWagon = { ...wagonItem.availableCars[Math.floor(Math.random() * wagonItem.availableCars.length)] };
+          break;
+        }
+
+        rand -= wagonItem.chance;
+      }
+
+      return randCarWagon!;
+    },
+
+    // getRandomStockItem() {
+    //   const totalChancePot = this.chosenCarWagonList.reduce((total, car) => {
+    //     total += car.chance;
+    //     return total;
+    //   }, 0);
+
+    //   let rand = Math.random() * totalChancePot;
+    //   let randomCarWagon: RandomStockCarWagon | undefined = undefined;
+
+    //   for (let wagonItem of this.chosenCarWagonList) {
+    //     if (rand < wagonItem.chance) {
+    //       randomCarWagon = { ...wagonItem };
+    //       break;
+    //     }
+
+    //     rand -= wagonItem.chance;
+    //   }
+
+    //   return randomCarWagon!;
+    // },
+
     // randomize() {
     //   if (this.chosenCarTypes.length == 0) {
     //     alert('Wybierz przynajmniej jeden rodzaj wagonów!');
@@ -234,60 +344,6 @@ export default defineComponent({
 
     //   this.store.isRandomizerCardOpen = false;
     // },
-
-    // addLocomotive() {
-    //   const previousStock =
-    //     this.store.stockList.length > 0 ? this.store.stockList[this.store.stockList.length - 1] : null;
-
-    //   if (previousStock && previousStock.type == loco.type) {
-    //     this.store.stockList[this.store.stockList.length - 1].count++;
-    //     return;
-    //   }
-
-    //   const stockObj: IStock = {
-    //     id: `${Date.now() + this.store.stockList.length}`,
-    //     type: loco.type,
-    //     length: loco.length,
-    //     mass: loco.mass,
-    //     maxSpeed: loco.maxSpeed,
-    //     isLoco: true,
-    //     cargo: undefined,
-    //     count: 1,
-    //     imgSrc: loco.imageSrc,
-    //     useType: loco.power,
-    //     supportersOnly: loco.supportersOnly,
-    //   };
-
-    //   if (this.store.stockList.length > 0 && !this.store.stockList[0].isLoco) this.store.stockList.unshift(stockObj);
-    //   else this.store.stockList.push(stockObj);
-    // },
-
-    addCar(car: ICarWagon, cargo?: ICargo) {
-      const previousStock =
-        this.store.stockList.length > 0 ? this.store.stockList[this.store.stockList.length - 1] : null;
-
-      if (previousStock && previousStock.type == car.type && previousStock.cargo?.id == cargo?.id) {
-        this.store.stockList[this.store.stockList.length - 1].count++;
-
-        return;
-      }
-
-      const stockObj: IStock = {
-        id: `${Date.now() + this.store.stockList.length}`,
-        type: car.type,
-        length: car.length,
-        mass: car.mass,
-        maxSpeed: car.maxSpeed,
-        isLoco: false,
-        cargo: car.loadable && cargo ? cargo : undefined,
-        count: 1,
-        imgSrc: car.imageSrc,
-        useType: car.useType,
-        supportersOnly: car.supportersOnly,
-      };
-
-      this.store.stockList.push(stockObj);
-    },
   },
 });
 </script>
@@ -314,7 +370,7 @@ export default defineComponent({
   height: 90vh;
   max-height: 900px;
 
-  background: #242424;
+  background: #111;
 
   @media screen and (max-width: 700px) {
     width: 95%;
@@ -323,10 +379,6 @@ export default defineComponent({
   border-radius: 1em;
 }
 
-p {
-  font-size: 1.2em;
-}
-
 h1 {
   text-align: center;
   color: $accentColor;
@@ -337,14 +389,13 @@ h3 {
   margin: 0 0 0.5em 0;
 }
 
-.car-choice div {
-  display: grid;
+.rules {
+  margin: 0.5em 0;
 
-  grid-template-columns: repeat(6, 1fr);
-  justify-content: center;
-
-  @media screen and (max-width: 800px) {
-    grid-template-columns: repeat(4, 1fr);
+  ul {
+    list-style: inside;
+    border: 1px solid $accentColor;
+    padding: 0.5em;
   }
 }
 
@@ -398,6 +449,31 @@ h3 {
   }
 }
 
+.carwagon-list li {
+  margin: 0.5em 0;
+
+  display: flex;
+  align-items: center;
+
+  > * {
+    margin-right: 0.5em;
+  }
+
+  input.carwagon-type {
+    width: auto;
+  }
+
+  select.carwagon-cargo {
+    max-width: 150px;
+  }
+  .carwagon-chance {
+    input {
+      font-weight: bold;
+      width: auto;
+    }
+  }
+}
+
 .random-stock-selections {
   text-align: left;
 
@@ -406,37 +482,6 @@ h3 {
   }
 }
 
-ul.carwagons-list li select {
-  margin: 0.5em 0.5em 0 0;
-  &.select-type {
-    width: 250px;
-  }
-
-  &.select-cargo {
-    width: 120px;
-  }
-}
-
-.carwagon-chance {
-  position: relative;
-  font-size: 1.2em;
-  font-weight: bold;
-
-  input {
-    background-color: white;
-    height: 1.6em;
-    border: none;
-    width: 3em;
-  }
-
-  &::after {
-    content: '%';
-    top: 0;
-    right: -1em;
-    position: absolute;
-  }
-}
-
 @media screen and (max-width: 600px) {
   .car-preview .image-wrapper {
     width: 20em;
diff --git a/src/data/vehicleData.json b/src/data/vehicleData.json
index 9abfd74..4b65068 100644
--- a/src/data/vehicleData.json
+++ b/src/data/vehicleData.json
@@ -1342,7 +1342,7 @@
     ],
     [
       "304C_PLK_Rob",
-      "304c",
+      "304C",
       false,
       false,
       "140",
@@ -1446,7 +1446,7 @@
     ],
     [
       "Gor77_PKP_Bhp_01",
-      "Bhp",
+      "Gor77",
       false,
       false,
       "120",
@@ -1454,7 +1454,7 @@
     ],
     [
       "Gor77_PKP_Bhp_02",
-      "Bhp",
+      "Gor77",
       false,
       false,
       "120",
@@ -1462,7 +1462,7 @@
     ],
     [
       "Gor77_PKP_Bhp_03",
-      "Bhp",
+      "Gor77",
       false,
       false,
       "120",
@@ -1585,7 +1585,7 @@
     ],
     [
       "29R_PLPOL_Zaekk_01",
-      "29R_PLPOL",
+      "29R",
       true,
       false,
       "100",
diff --git a/src/mixins/stockMixin.ts b/src/mixins/stockMixin.ts
new file mode 100644
index 0000000..7795bd6
--- /dev/null
+++ b/src/mixins/stockMixin.ts
@@ -0,0 +1,65 @@
+import { defineComponent } from 'vue';
+import { useStore } from '../store';
+import { ICargo, ICarWagon, ILocomotive, IStock, Vehicle } from '../types';
+import { isLocomotive } from '../utils/vehicleUtils';
+
+export default defineComponent({
+  setup() {
+    return {
+      store: useStore(),
+    };
+  },
+
+  methods: {
+    getStockId() {
+      return `${Math.random().toString(36).slice(5)}`;
+    },
+
+    getStockObject(vehicle: Vehicle, cargo?: ICargo, count = 1): IStock {
+      const isLoco = isLocomotive(vehicle);
+
+      return {
+        id: this.getStockId(),
+        type: vehicle.type,
+        length: vehicle.length,
+        mass: vehicle.mass,
+        maxSpeed: vehicle.maxSpeed,
+        isLoco,
+        cargo: !isLoco && vehicle.loadable && cargo ? cargo : undefined,
+        count,
+        imgSrc: vehicle.imageSrc,
+        useType: isLoco ? vehicle.power : vehicle.useType,
+        supportersOnly: false,
+      };
+    },
+
+    addLocomotive(loco: ILocomotive) {
+      const previousStock =
+        this.store.stockList.length > 0 ? this.store.stockList[this.store.stockList.length - 1] : null;
+      if (previousStock && previousStock.type == loco.type) {
+        this.store.stockList[this.store.stockList.length - 1].count++;
+        return;
+      }
+
+      const stockObj = this.getStockObject(loco);
+
+      if (this.store.stockList.length > 0 && !this.store.stockList[0].isLoco) this.store.stockList.unshift(stockObj);
+      else this.store.stockList.push(stockObj);
+    },
+
+    addCarWagon(car: ICarWagon, cargo?: ICargo) {
+      const previousStock =
+        this.store.stockList.length > 0 ? this.store.stockList[this.store.stockList.length - 1] : null;
+
+      if (previousStock && previousStock.type == car.type && previousStock.cargo?.id == cargo?.id) {
+        this.store.stockList[this.store.stockList.length - 1].count++;
+
+        return;
+      }
+
+      const stockObj = this.getStockObject(car, cargo);
+
+      this.store.stockList.push(stockObj);
+    },
+  },
+});
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 70e3cc4..4c7b6e8 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -54,12 +54,6 @@ a {
   }
 }
 
-p {
-  font-size: 1.2em;
-  font-weight: bold;
-  color: $accentColor;
-}
-
 select,
 option,
 input,
@@ -87,17 +81,22 @@ button {
 }
 
 button.btn {
-  padding: 0.25em 1em;
+  padding: 0.4em 0.75em;
 
-  border-radius: 0.25em;
-  border: 2px solid white;
   outline: none;
-  background: none;
+  background-color: #222;
 
   transition: all 250ms;
 
+  &.btn--outline {
+    background: none;
+    font-weight: bold;
+    outline: 1px solid $accentColor;
+  }
+
   &:focus-visible {
     color: $accentColor;
+    outline: 1px solid white;
   }
 
   &[data-disabled='true'] {
@@ -112,7 +111,7 @@ button.btn {
   &--text {
     font-weight: bold;
     transition: all 250ms;
-    border: none;
+    background: none;
 
     &:focus-visible {
       outline: 1px solid white;
@@ -121,6 +120,7 @@ button.btn {
 
   &--choice {
     padding: 0.25em 0.3em;
+    background-color: #222;
 
     &:focus-visible {
       outline: 1px solid white;
@@ -128,28 +128,8 @@ button.btn {
   }
 }
 
-button.btn-rect {
-  width: 1.5em;
-  height: 1.5em;
-  font-size: 1.65em;
-
-  line-height: 1em;
-
-  border-radius: 0.25em;
-  border: 2px solid black;
-  outline: none;
-  background: white;
-  color: black;
-
-  transition: all 250ms;
-
-  &:hover {
-    color: white;
-    background-color: black;
-  }
-}
-
-select {
+select,
+input {
   background: none;
   border: 2px solid white;
   outline: none;
@@ -160,6 +140,10 @@ select {
   font-size: 1em;
 
   width: 18em;
+
+  &:focus-visible {
+    border-color: $accentColor;
+  }
 }
 
 option {