diff --git a/.gitignore b/.gitignore
index 41b1d278..3bc4a7b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.pot
 *.pyc
 __pycache__
+**/*__pycache__
 db.sqlite3
 media
 ./car_inventory/settings.py
diff --git a/inventory/__pycache__/admin.cpython-311.pyc b/inventory/__pycache__/admin.cpython-311.pyc
index cea899cf..8464c550 100644
Binary files a/inventory/__pycache__/admin.cpython-311.pyc and b/inventory/__pycache__/admin.cpython-311.pyc differ
diff --git a/inventory/__pycache__/forms.cpython-311.pyc b/inventory/__pycache__/forms.cpython-311.pyc
index 0070bf8a..1580ed63 100644
Binary files a/inventory/__pycache__/forms.cpython-311.pyc and b/inventory/__pycache__/forms.cpython-311.pyc differ
diff --git a/inventory/__pycache__/mixins.cpython-311.pyc b/inventory/__pycache__/mixins.cpython-311.pyc
index 624f71e9..898d6b2b 100644
Binary files a/inventory/__pycache__/mixins.cpython-311.pyc and b/inventory/__pycache__/mixins.cpython-311.pyc differ
diff --git a/inventory/__pycache__/models.cpython-311.pyc b/inventory/__pycache__/models.cpython-311.pyc
index 63f8c414..06a9e577 100644
Binary files a/inventory/__pycache__/models.cpython-311.pyc and b/inventory/__pycache__/models.cpython-311.pyc differ
diff --git a/inventory/__pycache__/urls.cpython-311.pyc b/inventory/__pycache__/urls.cpython-311.pyc
index 68bca1ba..903da3dd 100644
Binary files a/inventory/__pycache__/urls.cpython-311.pyc and b/inventory/__pycache__/urls.cpython-311.pyc differ
diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc
index 78e18e8d..165043f6 100644
Binary files a/inventory/__pycache__/views.cpython-311.pyc and b/inventory/__pycache__/views.cpython-311.pyc differ
diff --git a/inventory/migrations/0029_merge_20241217_1724.py b/inventory/migrations/0029_merge_20241217_1724.py
new file mode 100644
index 00000000..d58a48af
--- /dev/null
+++ b/inventory/migrations/0029_merge_20241217_1724.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.1.4 on 2024-12-17 14:24
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0023_cartrim_id_car_model'),
+        ('inventory', '0028_alter_dealer_options'),
+    ]
+
+    operations = [
+    ]
diff --git a/inventory/migrations/0030_alter_carfinance_options_and_more.py b/inventory/migrations/0030_alter_carfinance_options_and_more.py
new file mode 100644
index 00000000..72031153
--- /dev/null
+++ b/inventory/migrations/0030_alter_carfinance_options_and_more.py
@@ -0,0 +1,69 @@
+# Generated by Django 5.1.4 on 2024-12-17 14:25
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0029_merge_20241217_1724'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='carfinance',
+            options={'verbose_name': 'Car Financial Details', 'verbose_name_plural': 'Car Financial Details'},
+        ),
+        migrations.AlterModelOptions(
+            name='carreservation',
+            options={'ordering': ['-reserved_at'], 'verbose_name': 'Car Reservation', 'verbose_name_plural': 'Car Reservations'},
+        ),
+        migrations.RemoveField(
+            model_name='carfinance',
+            name='vat_rate',
+        ),
+        migrations.AlterField(
+            model_name='carreservation',
+            name='car',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reservations', to='inventory.car', verbose_name='Car'),
+        ),
+        migrations.AlterField(
+            model_name='carreservation',
+            name='reserved_at',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Reserved At'),
+        ),
+        migrations.AlterField(
+            model_name='carreservation',
+            name='reserved_by',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reservations', to=settings.AUTH_USER_MODEL, verbose_name='Reserved By'),
+        ),
+        migrations.AlterField(
+            model_name='carreservation',
+            name='reserved_until',
+            field=models.DateTimeField(verbose_name='Reserved Until'),
+        ),
+        migrations.AlterField(
+            model_name='customcard',
+            name='car',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='custom_cards', to='inventory.car', verbose_name='Car'),
+        ),
+        migrations.CreateModel(
+            name='CarLocation',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('description', models.TextField(blank=True, help_text='Optional description about the showroom placement.', null=True, verbose_name='Description')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Last Updated')),
+                ('car', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='location', to='inventory.car', verbose_name='Car')),
+                ('owner', models.ForeignKey(help_text='Dealer who owns the car.', on_delete=django.db.models.deletion.CASCADE, related_name='owned_cars', to='inventory.dealer', verbose_name='Owner')),
+                ('showroom', models.ForeignKey(help_text='Dealer where the car is displayed (can be the owner).', on_delete=django.db.models.deletion.CASCADE, related_name='showroom_cars', to='inventory.dealer', verbose_name='Showroom')),
+            ],
+            options={
+                'verbose_name': 'Car Location',
+                'verbose_name_plural': 'Car Locations',
+            },
+        ),
+    ]