diff --git a/Gemfile b/Gemfile
index 7ead32c..420f8f7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,6 +93,5 @@ group :test do
   gem "rspec_junit_formatter"
   gem "simplecov", require: false
   gem "simplecov-cobertura", require: false
-  gem "vcr"
   gem "webmock"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ea81f1..7f70629 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -398,8 +398,6 @@ GEM
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uniform_notifier (1.16.0)
-    vcr (6.3.1)
-      base64
     web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
@@ -470,7 +468,6 @@ DEPENDENCIES
   tailwindcss-rails
   turbo-rails
   tzinfo-data
-  vcr
   web-console
   webmock
 
diff --git a/app/assets/stylesheets/calendar.css b/app/assets/stylesheets/calendar.css
new file mode 100644
index 0000000..a841bf2
--- /dev/null
+++ b/app/assets/stylesheets/calendar.css
@@ -0,0 +1,30 @@
+.calendar-container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  width: 100vw;
+  height: 100vh;
+  overflow: auto;
+  padding: 0;
+  margin: 0;
+}
+
+.calendar-grid {
+  width: 100%;
+  height: calc(100vh - 50px); /* Adjust based on your header height */
+  display: grid;
+  grid-template-columns: repeat(7, 1fr); /* 7 days */
+}
+
+.calendar-header {
+  position: sticky;
+  top: 0;
+  background-color: white;
+  z-index: 10;
+}
+
+.calendar-time-slot {
+  min-height: 50px; /* Adjust as needed */
+} 
\ No newline at end of file
diff --git a/app/assets/stylesheets/calendar.tailwind.css b/app/assets/stylesheets/calendar.tailwind.css
index 575ee47..5dbd28f 100644
--- a/app/assets/stylesheets/calendar.tailwind.css
+++ b/app/assets/stylesheets/calendar.tailwind.css
@@ -11,14 +11,60 @@
 }
 
 */
-body.calendar  {
-    height: 99vw;
-    overflow: hidden;
+body.calendar {
+  height: 100vh !important;
+  margin: 0 !important;
+  padding: 0 !important;
+  overflow: hidden !important;
 }
 
-toastui-calendar-time {
-    height: 99% !important;
+.toastui-calendar-time {
+  height: 100% !important;
 }
 
-.toastui-calendar-timegrid { height: 99%;  }
-.toastui-calendar-panel.toastui-calendar-time { overflow-y: inherit; }
\ No newline at end of file
+.toastui-calendar-timegrid {
+  height: 100% !important;
+}
+
+.toastui-calendar-panel.toastui-calendar-time {
+  overflow-y: inherit !important;
+}
+
+div[data-controller="main-calendar"] {
+  height: 100vh !important;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
+#main-calendar {
+  height: 100% !important;
+  width: 100% !important;
+}
+
+body.calendar main {
+  height: 100vh !important;
+  width: 100% !important;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
+.w-full {
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
+.flex.justify-between.items-center {
+  padding: 0.5rem 1rem !important;
+  margin-bottom: 0 !important;
+}
+
+.flex.justify-between.items-center-calendar {
+  padding: 0.5rem 1rem !important;
+  margin-bottom: 0 !important;
+  position: relative;
+}
+
+.px-5 {
+  padding-left: 20px !important;
+  padding-right: 20px !important;
+}
diff --git a/app/assets/stylesheets/fullscreen_calendar.css b/app/assets/stylesheets/fullscreen_calendar.css
new file mode 100644
index 0000000..aa383d0
--- /dev/null
+++ b/app/assets/stylesheets/fullscreen_calendar.css
@@ -0,0 +1,113 @@
+/* Force fullscreen for calendar elements */
+.fc, /* FullCalendar main container */
+.calendar-container,
+.simple-calendar,
+.calendar, 
+[data-controller="calendar"],
+#calendar,
+.calendar-wrapper {
+  width: 100% !important;
+  max-width: 100% !important;
+  margin: 0 !important;
+  padding: 0 !important;
+  overflow: auto !important;
+}
+
+/* Force table and grid elements to stretch */
+.fc-view-container,
+.fc-view,
+.fc-time-grid,
+.fc-slats,
+.fc-content-skeleton,
+table.calendar-table,
+.calendar-grid,
+.calendar-row,
+.time-slot-container {
+  width: 100% !important;
+  max-width: 100% !important;
+}
+
+/* If there's a container around the calendar */
+body > div.container,
+main.container,
+div.container-fluid,
+.content-wrapper,
+#main-content {
+  width: 100% !important;
+  max-width: 100% !important;
+  padding: 0 !important;
+  margin: 0 !important;
+}
+
+/* Fix for responsive issues */
+@media (min-width: 768px) {
+  .container, .container-md, .container-sm {
+    max-width: 100% !important;
+  }
+}
+
+@media (min-width: 992px) {
+  .container, .container-lg, .container-md, .container-sm {
+    max-width: 100% !important;
+  }
+}
+
+@media (min-width: 1200px) {
+  .container, .container-lg, .container-md, .container-sm, .container-xl {
+    max-width: 100% !important;
+  }
+}
+
+/* Reset container constraints */
+body.calendar {
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+}
+
+body.calendar main {
+  height: 100vh !important; /* Fix the 100vw typo in the layout */
+  width: 100vw !important;
+  margin: 0 !important;
+  padding: 0 !important;
+  max-width: none !important;
+}
+
+/* Make the calendar container fill the space */
+.w-full, .min-w-full {
+  width: 100vw !important;
+  max-width: 100vw !important;
+}
+
+div[data-controller="main-calendar"] {
+  height: 100vh !important; /* Was 90vh */
+  width: 100vw !important;
+  padding: 0 !important;
+  margin: 0 !important;
+}
+
+#main-calendar {
+  width: 100% !important;
+  height: 100% !important;
+}
+
+/* Toast UI Calendar specific fixes */
+.toastui-calendar-layout, 
+.toastui-calendar-week-view,
+.toastui-calendar-panel,
+.toastui-calendar-timegrid-container {
+  width: 100% !important;
+  max-width: 100% !important;
+}
+
+/* Remove unnecessary padding */
+.container, .mx-auto {
+  padding: 0 !important;
+  margin: 0 !important;
+  max-width: none !important;
+  width: 100vw !important;
+}
+
+.flex.justify-between {
+  padding: 0 1rem;
+} 
\ No newline at end of file
diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb
index fa7c725..f98a146 100644
--- a/app/controllers/customers_controller.rb
+++ b/app/controllers/customers_controller.rb
@@ -21,7 +21,7 @@ class CustomersController < ApplicationController
   # POST /customers or /customers.json
   def create
     @customer = Customer.new(customer_params)
-    @customer.company = @company
+    @customer.company = Company.first # Set the first company
 
     respond_to do |format|
       if @customer.save
@@ -57,15 +57,35 @@ class CustomersController < ApplicationController
     end
   end
 
+  def search
+    @customers = @company.customers.where(
+      "LOWER(first_name) LIKE :query OR LOWER(surname) LIKE :query OR original_phone LIKE :query",
+      query: "%#{params[:q].downcase}%"
+    ).limit(10)
+
+    render json: @customers.map { |c|
+      {
+        id: "#{c.first_name}_#{c.surname}_#{c.original_phone}",
+        label: "#{c.full_name} (#{c.original_phone})",
+        birthyear: c.birthyear
+      }
+    }
+  end
+
   private
 
   # Use callbacks to share common setup or constraints between actions.
   def set_customer
-    @customer = Customer.find(params[:id])
+    first_name, surname, original_phone = params[:composite_key].split('_')
+    @customer = Customer.find_by!(
+      first_name: first_name,
+      surname: surname,
+      original_phone: original_phone
+    )
   end
 
   # Only allow a list of trusted parameters through.
   def customer_params
-    params.require(:customer).permit(:name, :phone, :notes, :email, :birthyear)
+    params.require(:customer).permit(:first_name, :surname, :phone, :notes, :email, :birthyear)
   end
 end
diff --git a/app/controllers/reservations_controller.rb b/app/controllers/reservations_controller.rb
index a61ec09..0ef0877 100644
--- a/app/controllers/reservations_controller.rb
+++ b/app/controllers/reservations_controller.rb
@@ -14,8 +14,22 @@ class ReservationsController < ApplicationController
 
   # GET /reservations/new
   def new
-    @reservation = Reservation.new
-    @reservation.team = @company.teams.first
+    # logger.debug "--- Reservations#new --- Params received: #{params.inspect}"
+
+    # Use Time.zone.parse to interpret times within the application's configured timezone
+    start_time_param = params[:start_time]
+    end_time_param = params[:end_time]
+    # logger.debug "--- Reservations#new --- Start Param: #{start_time_param}, End Param: #{end_time_param}"
+
+    start_time = start_time_param ? Time.zone.parse(start_time_param) : Time.current
+    end_time = end_time_param ? Time.zone.parse(end_time_param) : Time.current + 30.minutes
+    # logger.debug "--- Reservations#new --- Parsed Start: #{start_time}, Parsed End: #{end_time}"
+
+    @reservation = Reservation.new(start_time: start_time, end_time: end_time)
+    # logger.debug "--- Reservations#new --- Reservation object initialized: #{@reservation.attributes.inspect}"
+
+    @reservation.team = @company.teams.first # Assign default team
+    @customers = @company.customers # Preload customers for potential dropdown
   end
 
   # GET /reservations/1/edit
@@ -23,31 +37,79 @@ class ReservationsController < ApplicationController
 
   # POST /reservations or /reservations.json
   def create
-    @reservation = Reservation.new(reservation_params)
-    @reservation.company = @company
+    @reservation = @company.reservations.new(
+      reservation_params.except(:customer_id, :customer_birth_year)
+    )
 
-    respond_to do |format|
-      if @reservation.save
-        format.html { redirect_to reservation_url(@reservation), notice: t('.reservation_created') }
-        format.json { render :show, status: :created, location: @reservation }
-      else
-        format.html { render :new, status: :unprocessable_entity }
-        format.json { render json: @reservation.errors, status: :unprocessable_entity }
-      end
+    # Find or create customer based on submitted attributes
+    find_or_create_customer
+    # Associate the reservation with the found/created customer's primary key attributes
+    assign_customer_to_reservation
+
+    if @reservation.save
+      redirect_to @reservation, notice: t('.reservation_created')
+    else
+      @customers = @company.customers
+      render :new, status: :unprocessable_entity
     end
+  rescue ActiveRecord::RecordInvalid => e
+    # If customer creation/validation fails
+    @reservation.errors.add(:base, "Failed to save customer: #{e.message}")
+    @customers = @company.customers
+    render :new, status: :unprocessable_entity
   end
 
   # PATCH/PUT /reservations/1 or /reservations/1.json
   def update
+    # Separate reservation attributes from customer attributes
+    customer_attrs = build_customer_attributes # Use existing helper
+    reservation_attrs = reservation_params.except(
+      :customer_id, :customer_first_name, :customer_surname,
+      :customer_original_phone, :customer_birth_year
+    )
+
+    # Find the customer identified by the submitted name/phone
+    @customer = Customer.find_by(
+      first_name: customer_attrs[:first_name],
+      surname: customer_attrs[:surname],
+      original_phone: customer_attrs[:original_phone],
+      company_id: @company.id
+    )
+
+    # Update customer phone/birthyear if found (identifiers assumed immutable here)
+    customer_updated = @customer ? @customer.update(customer_attrs.slice(:phone, :birthyear)) : false
+
+    # Assign the correct customer foreign keys to the reservation attributes
+    if @customer
+      reservation_attrs[:customer_first_name] = @customer.first_name
+      reservation_attrs[:customer_surname] = @customer.surname
+      reservation_attrs[:customer_original_phone] = @customer.original_phone
+    else
+      # Fall back to original keys if form customer wasn't found (e.g., identifiers changed)
+      # Consider adding an error or different handling if customer *must* be found.
+      reservation_attrs[:customer_first_name] = @reservation.customer_first_name
+      reservation_attrs[:customer_surname] = @reservation.customer_surname
+      reservation_attrs[:customer_original_phone] = @reservation.customer_original_phone
+    end
+
+    reservation_updated = @reservation.update(reservation_attrs)
+
     respond_to do |format|
-      if @reservation.update(reservation_params)
+      # Check if reservation update was successful
+      # (We might ignore customer_updated status for now, or add more complex checks)
+      if reservation_updated
         format.html { redirect_to reservation_url(@reservation), notice: t('.reservation_updated') }
         format.json { render :show, status: :ok, location: @reservation }
       else
+        @customers = @company.customers # Reload for form
         format.html { render :edit, status: :unprocessable_entity }
         format.json { render json: @reservation.errors, status: :unprocessable_entity }
       end
     end
+  rescue ActiveRecord::RecordInvalid => e # Catch potential customer update errors
+    @reservation.errors.add(:base, "Failed to save customer: #{e.message}") if @customer&.invalid?
+    @customers = @company.customers
+    render :edit, status: :unprocessable_entity
   end
 
   # DELETE /reservations/1 or /reservations/1.json
@@ -69,11 +131,74 @@ class ReservationsController < ApplicationController
 
   # Only allow a list of trusted parameters through.
   def reservation_params
-    params.require(:reservation).permit(:company_id, :customer_id, :team_id, :title, :description, :start_time,
-                                        :end_time)
+    # Permit composite key if form uses it, otherwise permit individual fields
+    # params.require(:reservation).permit(:customer_composite_key, ...)
+    params.require(:reservation).permit(
+      :team_id,
+      :start_time,
+      :end_time,
+      :customer_first_name,
+      :customer_surname,
+      :customer_original_phone,
+      :customer_birth_year,
+      :customer_id # Allow this if select still sends it sometimes
+    )
   end
 
   def determine_layout
     action_name == 'index' ? 'calendar' : 'application'
   end
+
+  # Finds or creates customer based on submitted fields
+  def find_or_create_customer
+    customer_params = build_customer_attributes
+
+    @customer = if new_customer?
+                  Customer.create!(customer_params)
+                else
+                  find_or_initialize_customer(customer_params)
+                end
+  end
+
+  # Extracts customer attributes from reservation form parameters
+  def build_customer_attributes
+    {
+      first_name: params[:reservation][:customer_first_name],
+      surname: params[:reservation][:customer_surname],
+      original_phone: params[:reservation][:customer_original_phone],
+      phone: params[:reservation][:customer_original_phone], # Assuming phone is same as original_phone for now
+      birthyear: params[:reservation][:customer_birth_year],
+      company_id: @company.id
+    }
+  end
+
+  # Checks if the submitted customer ID indicates a new customer
+  def new_customer?
+    # Check based on the specific value format used by TomSelect create function
+    params[:reservation][:customer_composite_key]&.end_with?('__new') ||
+      params[:reservation][:customer_id]&.end_with?('__new') # Fallback if old key is used
+  end
+
+  # Finds customer by composite key or creates them
+  def find_or_initialize_customer(attributes)
+    # Find using the composite key fields
+    Customer.find_or_create_by!(
+      first_name: attributes[:first_name],
+      surname: attributes[:surname],
+      original_phone: attributes[:original_phone]
+      # company_id: attributes[:company_id] # Scope to company if needed
+    ) do |customer|
+      # Assign other attributes only if creating
+      customer.assign_attributes(attributes.slice(:phone, :birthyear, :company_id))
+    end
+  end
+
+  # Sets the foreign key fields on the reservation based on the found/created customer
+  def assign_customer_to_reservation
+    return unless @customer # Guard clause
+
+    @reservation.customer_first_name = @customer.first_name
+    @reservation.customer_surname = @customer.surname
+    @reservation.customer_original_phone = @customer.original_phone
+  end
 end
diff --git a/app/javascript/controllers/calendar_controller.js b/app/javascript/controllers/calendar_controller.js
new file mode 100644
index 0000000..e838408
--- /dev/null
+++ b/app/javascript/controllers/calendar_controller.js
@@ -0,0 +1,18 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  connect() {
+    this.initializeCalendar();
+  }
+  
+  initializeCalendar() {
+    // If using a library like FullCalendar
+    const calendar = new FullCalendar.Calendar(this.element, {
+      height: '80vh', // Full viewport height
+      width: '100%',
+      // Other calendar options...
+    });
+    
+    calendar.render();
+  }
+} 
\ No newline at end of file
diff --git a/app/javascript/controllers/customer_search_controller.js b/app/javascript/controllers/customer_search_controller.js
new file mode 100644
index 0000000..9aba290
--- /dev/null
+++ b/app/javascript/controllers/customer_search_controller.js
@@ -0,0 +1,151 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["select", "phoneField", "birthYearField", "firstNameField", "surnameField", "newCustomerFields"]
+  static values = {
+    existingId: String,
+    existingLabel: String
+  }
+
+  connect() {
+    let initialOptions = [];
+    let initialValue = null;
+
+    if (this.hasExistingIdValue && this.hasExistingLabelValue && this.existingIdValue.length > 0) {
+      initialOptions = [{ id: this.existingIdValue, label: this.existingLabelValue }];
+      initialValue = this.existingIdValue;
+    }
+
+    this.selectInstance = new TomSelect(this.selectTarget, {
+      valueField: 'id',
+      labelField: 'label',
+      searchField: ['label'],
+      maxItems: 1,
+      create: true,
+      createOnBlur: true,
+      placeholder: 'Type to search customers...',
+      
+      create: function(input) {
+        return {
+          id: `${input}__new`,
+          label: `${input} (New Customer)`
+        };
+      },
+      
+      options: initialOptions,
+      items: initialValue ? [initialValue] : [],
+      
+      load: async (query, callback) => {
+        if (!query.length && !initialValue) return callback();
+        
+        try {
+          const response = await fetch(`/customers/search?q=${encodeURIComponent(query)}`, {
+            headers: {
+              'Accept': 'application/json',
+              'X-Requested-With': 'XMLHttpRequest'
+            }
+          });
+          const data = await response.json();
+          
+          const existingOptionId = this.hasExistingIdValue ? this.existingIdValue : null;
+          const filteredData = data.filter(item => item.id !== existingOptionId);
+          
+          callback(filteredData);
+        } catch (error) {
+          console.error('Error loading customers:', error);
+          callback();
+        }
+      },
+
+      shouldLoad: function(query) {
+        return query.length >= 2;
+      },
+      
+      render: {
+        no_results: (data, escape) => {
+          return '<div class="no-results">No customers found. Fill in the details below.</div>';
+        },
+        option: function(item) {
+          return `<div>${item.label}</div>`;
+        }
+      },
+
+      onLoad: (data) => {
+        if (!this.selectInstance.getValue() && (!data || data.length === 0)) {
+          this.showNewCustomerFields();
+        }
+      },
+      
+      onChange: (value) => {
+        if (value === null || value === '') {
+          this.showNewCustomerFields();
+        } else if (!value.endsWith('__new')) {
+            this.newCustomerFieldsTarget.classList.add('hidden');
+        } 
+      },
+
+      onItemAdd: (value) => {
+        this.customerSelected(value);
+      },
+
+      onDropdownClose: (dropdown) => {
+        if (!this.selectInstance.getValue()) {
+          this.showNewCustomerFields();
+        }
+      }
+    });
+
+    if (initialValue) {
+       this.newCustomerFieldsTarget.classList.add('hidden');
+       this.customerSelected(initialValue); 
+    }
+  }
+
+  customerSelected(value) {
+    if (value.endsWith('__new')) {
+      const firstName = value.replace('__new', '');
+      this.firstNameFieldTarget.value = firstName;
+      this.showNewCustomerFields();
+      return;
+    }
+
+    const [firstName, surname, phone] = value.split('_');
+    
+    if (firstName && surname && phone) {
+      const customerData = this.selectInstance.options[value];
+      
+      this.phoneFieldTarget.value = phone;
+      this.firstNameFieldTarget.value = firstName;
+      this.surnameFieldTarget.value = surname;
+      
+      if (customerData && customerData.birthyear) {
+        this.birthYearFieldTarget.value = customerData.birthyear;
+      } else {
+         this.birthYearFieldTarget.value = '';
+      }
+      
+      this.newCustomerFieldsTarget.classList.add('hidden');
+    } else {
+      console.warn("Selected customer value format unexpected:", value);
+      this.clearFields();
+      this.showNewCustomerFields();
+    }
+  }
+
+  showNewCustomerFields() {
+    this.newCustomerFieldsTarget.classList.remove('hidden');
+  }
+
+  clearFields() {
+    this.phoneFieldTarget.value = '';
+    this.firstNameFieldTarget.value = '';
+    this.surnameFieldTarget.value = '';
+    this.birthYearFieldTarget.value = '';
+  }
+
+  disconnect() {
+    if (this.selectInstance) {
+      this.selectInstance.destroy();
+    }
+  }
+} 
\ No newline at end of file
diff --git a/app/javascript/controllers/main_calendar_controller.js b/app/javascript/controllers/main_calendar_controller.js
index 627ff1b..142cf64 100644
--- a/app/javascript/controllers/main_calendar_controller.js
+++ b/app/javascript/controllers/main_calendar_controller.js
@@ -2,7 +2,13 @@ import {Controller} from "@hotwired/stimulus"
 // Connects to data-controller="main-calendar"
 
 export default class extends Controller {
+  static targets = ["dateDisplay", "navigation"]
+
   connect() {
+    // Set height to full viewport
+    document.getElementById('main-calendar').style.height = '100vh';
+    document.getElementById('main-calendar').style.width = '100vw';
+    
     const calendar = new tui.Calendar(document.getElementById('main-calendar'), {
       defaultView: 'week',
       usageStatistics: false,
@@ -10,12 +16,40 @@ export default class extends Controller {
         taskView: false,
         scheduleView: false,
         eventView: ['time'],
+        startDayOfWeek: 1, // Start week on Monday
         hourStart: 4,
         hourEnd: 21,
       },
+      timezone: {
+        zones: [
+          {
+            timezoneName: 'UTC',
+            displayLabel: 'UTC' // Optional: Label for the timezone
+          }
+        ]
+        // You might need `primaryTimezone: 'UTC'` here as well, 
+        // depending on the exact library version and desired behavior.
+        // Let's start with just zones.
+      },
+      // This is important - set the height to 100%
+      height: '100%',
+      // Make sure it takes full width
+      width: '100%',
       template: {
         timegridDisplayPrimaryTime({time}) {
           return `${time.getHours()} sati`;
+        },
+        popupDetailLocation(eventObj) {
+          return ''; // Empty location as requested
+        },
+        popupDetailAttendees(eventObj) {
+          return eventObj.attendees[0]; // Show team name
+        },
+        popupDetailState(eventObj) {
+          return '';
+        },
+        popupDetailBody(eventObj) {
+          return '';
         }
       },
       calendars: [
@@ -25,11 +59,114 @@ export default class extends Controller {
           backgroundColor: '#00a9ff',
         },
       ],
+      // Enable the built-in popup
+      useDetailPopup: true,
+    });
+
+    // Listener for clicks on empty time slots
+    calendar.on('selectDateTime', (eventData) => {
+      const startTime = new Date(eventData.start);
+      const endTime = new Date(startTime.getTime() + 30 * 60000); // Add 30 minutes
+
+      const formatForUrl = (date) => {
+        const year = date.getFullYear();
+        const month = (date.getMonth() + 1).toString().padStart(2, '0');
+        const day = date.getDate().toString().padStart(2, '0');
+        const hours = date.getHours().toString().padStart(2, '0');
+        const minutes = date.getMinutes().toString().padStart(2, '0');
+        return `${year}-${month}-${day}T${hours}:${minutes}:00`;
+      };
+
+      const startTimeParam = formatForUrl(startTime);
+      const endTimeParam = formatForUrl(endTime);
+
+      const newReservationUrl = `/reservations/new?start_time=${encodeURIComponent(startTimeParam)}&end_time=${encodeURIComponent(endTimeParam)}`;
+      
+      if (window.Turbo) {
+        Turbo.visit(newReservationUrl);
+      } else {
+        window.location.href = newReservationUrl; // Fallback: Full page reload
+      }
+
+      // Prevent TUI Calendar from creating its default event/guide element
+      return false;
+    });
+
+    // Listener for delete button in popup
+    calendar.on('beforeDeleteEvent', async (eventObj) => {
+      const reservationId = eventObj.id;
+      const calendarId = eventObj.calendarId;
+
+      if (!reservationId) {
+        console.error("Reservation ID not found in event object.");
+        return false;
+      }
+
+      const csrfToken = this.getCsrfToken();
+      if (!csrfToken) {
+        console.error("CSRF token not found.");
+        alert("Error: Could not verify request security token.");
+        return false;
+      }
+
+      try {
+        const response = await fetch(`/reservations/${reservationId}`, {
+          method: 'DELETE',
+          headers: {
+            'X-CSRF-Token': csrfToken,
+            'Accept': 'application/json'
+          }
+        });
+
+        if (response.ok) {
+          calendar.deleteEvent(reservationId, calendarId);
+          alert('Reservation deleted.');
+        } else {
+          console.error(`Failed to delete reservation ${reservationId}. Status: ${response.status}`);
+          let errorMessage = 'Error deleting reservation.';
+          try {
+            const errorData = await response.json();
+            errorMessage += ` Server says: ${errorData.error || JSON.stringify(errorData)}`;
+          } catch (e) { /* Ignore */ }
+          alert(errorMessage);
+        }
+      } catch (error) {
+        console.error("Network error or exception during delete:", error);
+        alert("Error deleting reservation due to a network or script issue.");
+      }
+
+      return false; // Prevent TUI default delete handling
+    });
+
+    // Listener for edit button in popup (or drag/resize completion)
+    calendar.on('beforeUpdateEvent', (eventInfo) => {
+      const eventId = eventInfo.event?.id;
+
+      if (!eventId) {
+        console.error("Cannot edit: Event ID not found.");
+        return false;
+      }
+
+      // Navigate to edit page for both edit clicks and drag/resize events
+      const editUrl = `/reservations/${eventId}/edit`;
+      
+      if (window.Turbo) {
+        Turbo.visit(editUrl);
+      } else {
+        window.location.href = editUrl;
+      }
+
+      // Prevent TUI's default update action
+      return false;
     });
 
     window.calendar = calendar;
     this.getCalendardata();
+    
     calendar.render();
+    
+    // Update the date display after rendering
+    this.updateDateDisplay();
   }
 
   getCalendardata() {
@@ -40,14 +177,81 @@ export default class extends Controller {
         {
           id: reservation.id,
           calendarId: 'cal1',
-          title: reservation.customer.name,
+          title: reservation.customer.first_name + ' ' + reservation.customer.surname + ' (' + reservation.customer.phone + ')',
           category: 'time',
           dueDateClass: reservation.dueDateClass,
-          location: reservation.team.name,
+          location: '', // Empty location as requested
+          attendees: [reservation.team.name], // Team name as attendee
           start: reservation.start_time,
           end: reservation.end_time
         }
       ])
     });
   }
-}
+  
+  // Helper function to get CSRF token from meta tag
+  getCsrfToken() {
+    const token = document.querySelector('meta[name="csrf-token"]')?.content;
+    return token;
+  }
+
+  // Navigation methods - using the global window.calendar
+  prev() {
+    window.calendar.prev();
+    this.updateDateDisplay();
+  }
+  
+  next() {
+    window.calendar.next();
+    this.updateDateDisplay();
+  }
+  
+  today() {
+    window.calendar.today();
+    this.updateDateDisplay();
+  }
+  
+  // Helper for updating the date display
+  updateDateDisplay() {
+    if (this.hasDateDisplayTarget) {
+      const calendar = window.calendar;
+      const currentDate = calendar.getDate();
+      
+      // Format the date range based on the current view
+      const view = calendar.getViewName();
+      
+      if (view === 'day') {
+        this.dateDisplayTarget.textContent = this.formatDate(currentDate);
+      } else if (view === 'week') {
+        // For week view, show range (e.g., "Aug 1 - 7, 2023")
+        const weekStart = new Date(currentDate);
+        weekStart.setDate(weekStart.getDate() - weekStart.getDay() + (weekStart.getDay() === 0 ? -6 : 1));
+        
+        const weekEnd = new Date(weekStart);
+        weekEnd.setDate(weekStart.getDate() + 6);
+        
+        this.dateDisplayTarget.textContent = `${this.formatDateShort(weekStart)} - ${this.formatDateShort(weekEnd)}`;
+      } else if (view === 'month') {
+        // For month view, show month and year (e.g., "August 2023")
+        this.dateDisplayTarget.textContent = currentDate.toLocaleString('default', { month: 'long', year: 'numeric' });
+      }
+    }
+  }
+  
+  // Helper for formatting dates
+  formatDate(date) {
+    return date.toLocaleDateString('default', { 
+      weekday: 'short', 
+      month: 'short', 
+      day: 'numeric', 
+      year: 'numeric' 
+    });
+  }
+  
+  formatDateShort(date) {
+    return date.toLocaleDateString('default', { 
+      month: 'short', 
+      day: 'numeric'
+    });
+  }
+}
\ No newline at end of file
diff --git a/app/models/customer.rb b/app/models/customer.rb
index ebc5777..8dbd71a 100644
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -1,7 +1,40 @@
 class Customer < ApplicationRecord
+  # Use Rails 7.1's native composite primary key
+  self.primary_key = %i[first_name surname original_phone]
+
   belongs_to :company
 
-  validates :name, presence: true, uniqueness: { scope: :company_id }
+  validates :first_name, presence: true
+  validates :surname, presence: true
   validates :phone, presence: true
+  validates :original_phone, presence: true
   validates :company_id, presence: true
+
+  validates :first_name, uniqueness: {
+    scope: %i[surname original_phone company_id],
+    message: -> { I18n.t('customers.customer.already_exists') }
+  }
+
+  validates :birthyear, numericality: {
+    only_integer: true,
+    greater_than: 1900,
+    less_than_or_equal_to: -> { Time.current.year }
+  }, allow_nil: true
+
+  before_validation :set_original_phone, on: :create
+
+  def full_name
+    [first_name, surname].compact_blank.join(' ')
+  end
+
+  # Add method for URL generation
+  def to_param
+    [first_name, surname, original_phone].join('_')
+  end
+
+  private
+
+  def set_original_phone
+    self.original_phone = phone if original_phone.blank?
+  end
 end
diff --git a/app/models/reservation.rb b/app/models/reservation.rb
index 532094d..1a91622 100644
--- a/app/models/reservation.rb
+++ b/app/models/reservation.rb
@@ -1,11 +1,28 @@
 class Reservation < ApplicationRecord
   belongs_to :company
-  belongs_to :customer
+  belongs_to :customer,
+             primary_key: %i[first_name surname original_phone],
+             query_constraints: %i[customer_first_name customer_surname customer_original_phone]
   belongs_to :team
 
   validates :company_id, presence: true
-  validates :customer_id, presence: true
   validates :team_id, presence: true
+
+  # Remove customer_id validation since we're using composite key
+  validates :customer_first_name, :customer_surname, :customer_original_phone, presence: true
+
+  # Add validation to ensure customer exists
+  validate :customer_must_exist
+
+  private
+
+  def customer_must_exist
+    unless Customer.exists?(first_name: customer_first_name,
+                            surname: customer_surname,
+                            original_phone: customer_original_phone)
+      errors.add(:base, "Selected customer does not exist")
+    end
+  end
 end
 
 class ReservationSerializer < ActiveModel::Serializer
diff --git a/app/views/customers/_customer.html.erb b/app/views/customers/_customer.html.erb
index 0957736..a11b2e6 100644
--- a/app/views/customers/_customer.html.erb
+++ b/app/views/customers/_customer.html.erb
@@ -1,7 +1,12 @@
 <div id="<%= dom_id customer %>">
   <p class="my-5">
-    <strong class="block font-medium mb-1">Name:</strong>
-    <%= customer.name %>
+    <strong class="block font-medium mb-1">First Name:</strong>
+    <%= customer.first_name %>
+  </p>
+
+  <p class="my-5">
+    <strong class="block font-medium mb-1">Surname:</strong>
+    <%= customer.surname %>
   </p>
 
   <p class="my-5">
diff --git a/app/views/customers/_form.html.erb b/app/views/customers/_form.html.erb
index 63b5b59..e2bb48b 100644
--- a/app/views/customers/_form.html.erb
+++ b/app/views/customers/_form.html.erb
@@ -12,8 +12,13 @@
   <% end %>
 
   <div class="my-5">
-    <%= form.label :name %>
-    <%= form.text_field :name, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
+    <%= form.label :first_name %>
+    <%= form.text_field :first_name, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
+  </div>
+
+  <div class="my-5">
+    <%= form.label :surname %>
+    <%= form.text_field :surname, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
   </div>
 
   <div class="my-5">
diff --git a/app/views/customers/index.html.erb b/app/views/customers/index.html.erb
index 20d5c7d..a726a71 100644
--- a/app/views/customers/index.html.erb
+++ b/app/views/customers/index.html.erb
@@ -14,7 +14,7 @@
     <% @customers.each do |customer| %>
       <%= render customer %>
       <p>
-        <%= link_to "Show this customer", customer, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
+        <%= link_to "Show this customer", customer_path(customer), class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
       </p>
     <% end %>
   </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1cde6ff..ecbddf7 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,9 +9,11 @@
     <script src="https://uicdn.toast.com/calendar/latest/toastui-calendar.min.js"></script>
     <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
     <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
-    <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
+
 
     <%= javascript_importmap_tags %>
+    <link href="https://cdn.jsdelivr.net/npm/tom-select@2.2.2/dist/css/tom-select.css" rel="stylesheet">
+    <script src="https://cdn.jsdelivr.net/npm/tom-select@2.2.2/dist/js/tom-select.complete.min.js"></script>
   </head>
 
   <body>
diff --git a/app/views/layouts/calendar.html.erb b/app/views/layouts/calendar.html.erb
index 427618e..2d4def9 100644
--- a/app/views/layouts/calendar.html.erb
+++ b/app/views/layouts/calendar.html.erb
@@ -9,14 +9,54 @@
     <script src="https://uicdn.toast.com/calendar/latest/toastui-calendar.min.js"></script>
     <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
     <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
-    <%= stylesheet_link_tag "calendar.tailwind", "data-turbo-track": "reload" %>
+
 
     <%= javascript_importmap_tags %>
+    <style>
+      html, body {
+        margin: 0;
+        padding: 0;
+        height: 100vh;
+        width: 100vw;
+        overflow: hidden;
+      }
+      body.calendar {
+        height: 100vh;
+        width: 100vw;
+        overflow: hidden;
+      }
+      body.calendar main {
+        height: 100vh;
+        width: 100vw;
+        margin: 0;
+        padding: 0;
+      }
+      .w-full, .min-w-full, div[data-controller="main-calendar"] {
+        height: 100vh;
+        width: 100vw;
+        margin: 0;
+        padding: 0;
+      }
+      #main-calendar {
+        height: 100vh;
+        width: 100vw;
+      }
+      .flex.justify-between.items-center {
+        position: absolute;
+        top: 10px;
+        left: 10px;
+        z-index: 1000;
+        background: rgba(255,255,255,0.8);
+        padding: 5px;
+        border-radius: 5px;
+      }
+    </style>
   </head>
 
   <body class="calendar">
-    <main style="height: 100vw;">
+    <main>
       <%= yield %>
     </main>
   </body>
 </html>
+want 
\ No newline at end of file
diff --git a/app/views/reservations/_form.html.erb b/app/views/reservations/_form.html.erb
index cf213bd..c4c8f86 100644
--- a/app/views/reservations/_form.html.erb
+++ b/app/views/reservations/_form.html.erb
@@ -1,38 +1,88 @@
-<%= form_with(model: reservation, class: "contents") do |form| %>
-  <% if reservation.errors.any? %>
-    <div id="error_explanation" class="bg-red-50 text-red-500 px-3 py-2 font-medium rounded-lg mt-3">
-      <h2><%= pluralize(reservation.errors.count, "error") %> prohibited this reservation from being saved:</h2>
+  <%= form_with(model: reservation, class: "contents", 
+                data: { 
+                  controller: "customer-search",
+                  customer_search_existing_id_value: (reservation.persisted? && reservation.customer ? reservation.customer.to_param : nil),
+                  customer_search_existing_label_value: (reservation.persisted? && reservation.customer ? "#{reservation.customer.full_name} (#{reservation.customer.original_phone})" : nil)
+                }) do |form| %>
+    <% if reservation.errors.any? %>
+      <div id="error_explanation" class="bg-red-50 text-red-500 px-3 py-2 font-medium rounded-lg mt-3">
+        <h2><%= pluralize(reservation.errors.count, "error") %> prohibited this reservation from being saved:</h2>
 
-      <ul>
-        <% reservation.errors.each do |error| %>
-          <li><%= error.full_message %></li>
-        <% end %>
-      </ul>
+        <ul>
+          <% reservation.errors.each do |error| %>
+            <li><%= error.full_message %></li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+
+    <div class="my-5">
+      <%= form.label :customer %>
+      <%= form.select :customer_composite_key,
+                    [],  # Start with empty options
+                    { prompt: "Type to search customers..." },
+                    {
+                      selected: (reservation.persisted? && reservation.customer ? reservation.customer.to_param : nil),
+                      class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full",
+                      data: { customer_search_target: "select" }
+                    } %>
+    </div>
+
+    <div class="my-5">
+      <%= form.label :phone_number %>
+      <%= form.telephone_field :customer_original_phone,
+                            class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full",
+                            data: { customer_search_target: "phoneField" } %>
+    </div>
+
+    <div data-customer-search-target="newCustomerFields" class="hidden">
+      <div class="my-5">
+        <%= form.label :first_name %>
+        <%= form.text_field :customer_first_name,
+                          class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full",
+                          data: { customer_search_target: "firstNameField" } %>
+      </div>
+
+      <div class="my-5">
+        <%= form.label :surname %>
+        <%= form.text_field :customer_surname,
+                          class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full",
+                          data: { customer_search_target: "surnameField" } %>
+      </div>
+
+      <div class="my-5">
+        <%= form.label :birth_year %>
+        <%= form.number_field :customer_birth_year,
+                            class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full",
+                            data: { customer_search_target: "birthYearField" } %>
+      </div>
+    </div>
+
+    <div class="my-5">
+      <%= form.label :team_id %>
+      <%= form.collection_select :team_id,
+                              @company.teams,
+                              :id,
+                              :name,
+                              { prompt: "Select a team" },
+                              class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
+    </div>
+
+    <div class="my-5">
+      <%= form.label :start_time %>
+      <%= form.datetime_field :start_time, 
+                             class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full",
+                             id: "start_time_field" %>
+    </div>
+
+    <div class="my-5">
+      <%= form.label :end_time %>
+      <%= form.datetime_field :end_time, 
+                             class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full",
+                             id: "end_time_field" %>
+    </div>
+
+    <div class="inline">
+      <%= form.submit class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
     </div>
   <% end %>
-
-  <div class="my-5">
-    <%= form.label :customer_id %>
-    <%= form.collection_select :customer_id, @company.customers, :id, :name, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
-  </div>
-
-  <div class="my-5">
-    <%= form.label :team_id %>
-    <%= form.collection_select :team_id, @company.teams, :id, :name, prompt: "Select a Team", class:"block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"  %>
-  </div>
-
-
-  <div class="my-5">
-    <%= form.label :start_time %>`
-    <%= form.datetime_field :start_time, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
-  </div>
-
-  <div class="my-5">
-    <%= form.label :end_time %>
-    <%= form.datetime_field :end_time, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
-  </div>
-
-  <div class="inline">
-    <%= form.submit class: "rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer" %>
-  </div>
-<% end %>
diff --git a/app/views/reservations/_reservation.html.erb b/app/views/reservations/_reservation.html.erb
index 2e8c2a1..885efb4 100644
--- a/app/views/reservations/_reservation.html.erb
+++ b/app/views/reservations/_reservation.html.erb
@@ -6,7 +6,8 @@
 
   <p class="my-5">
     <strong class="block font-medium mb-1">Customer:</strong>
-    <%= reservation.customer_id %>
+    <%= reservation.customer.try(:full_name) || "N/A" %>
+    (<%= reservation.customer.try(:birthyear) %>)
   </p>
 
   <p class="my-5">
@@ -16,12 +17,12 @@
 
   <p class="my-5">
     <strong class="block font-medium mb-1">Start time:</strong>
-    <%= reservation.start_time %>
+    <%= l reservation.start_time if reservation.start_time %>
   </p>
 
   <p class="my-5">
     <strong class="block font-medium mb-1">End time:</strong>
-    <%= reservation.end_time %>
+    <%= l reservation.end_time if reservation.end_time %>
   </p>
 
 </div>
diff --git a/app/views/reservations/index.html.erb b/app/views/reservations/index.html.erb
index 71eb358..3f871a8 100644
--- a/app/views/reservations/index.html.erb
+++ b/app/views/reservations/index.html.erb
@@ -1,16 +1,37 @@
-<div class="w-full" style="height: 100%">
-  <% if notice.present? %>
-    <p class="py-2 px-3 bg-green-50 mb-5 text-green-500 font-medium rounded-lg inline-block" id="notice"><%= notice %></p>
-  <% end %>
+<!-- Separate the page into two distinct parts -->
+<div class="reservation-page" data-controller="main-calendar" style="display: block; width: 100%; height: 100vh; overflow: hidden;">
+  <!-- Fixed height header -->
+  <header style="height: 80px; padding: 15px; background-color: white; box-shadow: 0 2px 4px rgba(0,0,0,0.1); position: relative; z-index: 100;">
+    <% if notice.present? %>
+      <p class="py-2 px-3 bg-green-50 text-green-500 font-medium rounded-lg inline-block" id="notice"><%= notice %></p>
+    <% end %>
 
-  <% content_for :title, "Reservations" %>
+    <% content_for :title, "Reservations" %>
 
-  <div class="flex justify-between items-center">
-    <h1 class="font-bold text-4xl">Reservations</h1>
-    <%= link_to "New reservation", new_reservation_path, class: "rounded-lg py-3 px-5 bg-blue-600 text-white block font-medium" %>
+    <div class="flex justify-between items-center-calendar">
+      <div class="flex items-center space-x-4">
+        <h1 class="font-bold text-4xl px-5">Reservations</h1>
+        <div class="flex items-center space-x-2 ml-6" data-main-calendar-target="navigation">
+          <button data-action="main-calendar#prev" class="px-3 py-1 bg-gray-100 rounded-md hover:bg-gray-200">
+            &laquo; Prev
+          </button>
+          <button data-action="main-calendar#today" class="px-3 py-1 bg-gray-100 rounded-md hover:bg-gray-200">
+            Today
+          </button>
+          <button data-action="main-calendar#next" class="px-3 py-1 bg-gray-100 rounded-md hover:bg-gray-200">
+            Next &raquo;
+          </button>
+          <span data-main-calendar-target="dateDisplay" class="ml-3 font-medium"></span>
+        </div>
+      </div>
+      <%= link_to "New reservation", new_reservation_path, class: "rounded-lg py-3 px-5 bg-blue-600 text-white block font-medium ml-auto" %>
+    </div>
+  </header>
+  
+  <!-- Calendar container - with fixed top position and precise height calculation -->
+  <div class="calendar-container" style="height: calc(100vh - 80px); width: 100%; position: relative; top: 0; left: 0;">
+    <div style="height: 100%; width: 100%;">
+      <%= tag.div nil, data: {reservations: @reservations.to_json}, id: "main-calendar", style: "height: 100%; width: 100%;" %>
+    </div>
   </div>
-
-  <div data-controller="main-calendar" class="min-w-full" style="height: 90vh;"  >
-    <%= tag.div nil, data: {reservations: @reservations.to_json}, id: "main-calendar"%>
-  </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b736c39..173cbbc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -36,6 +36,8 @@ en:
       customer_updated: "Customer was successfully updated."
     destroy:
       customer_destroyed: "Customer was successfully destroyed."
+    customer:
+      already_exists: "This customer already exists in this company"
   reservations:
     create:
       reservation_created: "Reservation was successfully created."
diff --git a/config/routes.rb b/config/routes.rb
index 24638f2..2ab910a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,9 @@
 Rails.application.routes.draw do
   root "reservations#index"
+  resources :customers, param: :composite_key do
+    get :search, on: :collection
+  end
   resources :reservations
-  resources :customers
   resources :teams
   resources :companies
   # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
diff --git a/db/migrate/20250218071800_modify_customers_table.rb b/db/migrate/20250218071800_modify_customers_table.rb
new file mode 100644
index 0000000..371eecd
--- /dev/null
+++ b/db/migrate/20250218071800_modify_customers_table.rb
@@ -0,0 +1,97 @@
+class ModifyCustomersTable < ActiveRecord::Migration[7.1]
+  def up
+    # First, remove the foreign key constraint from reservations
+    remove_foreign_key :reservations, :customers if foreign_key_exists?(:reservations, :customers)
+    
+    # Create temporary columns without constraints
+    add_column :customers, :first_name, :string unless column_exists?(:customers, :first_name)
+    add_column :customers, :surname, :string unless column_exists?(:customers, :surname)
+    add_column :customers, :original_phone, :string unless column_exists?(:customers, :original_phone)
+    
+    # Copy data
+    execute <<-SQL
+      UPDATE customers 
+      SET first_name = name,
+          surname = '',
+          original_phone = phone
+    SQL
+    
+    # Now add the NOT NULL constraints
+    change_column_null :customers, :surname, false
+    change_column_null :customers, :original_phone, false
+    
+    # Remove old name column
+    remove_column :customers, :name if column_exists?(:customers, :name)
+    
+    # Remove existing indexes
+    remove_index :customers, name: :index_customers_composite_with_company, if_exists: true
+    remove_index :customers, name: :index_customers_on_name_and_company_id, if_exists: true
+    remove_index :customers, name: :index_customers_on_company_id, if_exists: true
+    remove_index :customers, name: :index_customers_on_composite_key, if_exists: true
+    remove_index :customers, name: :index_customers_on_composite_key_and_company, if_exists: true
+    
+    # Create new indexes
+    add_index :customers, [:first_name, :surname, :original_phone], 
+              unique: true,
+              name: 'index_customers_on_composite_key'
+    
+    add_index :customers, [:first_name, :surname, :original_phone, :company_id], 
+              unique: true,
+              name: 'index_customers_on_composite_key_and_company'
+              
+    # Add a non-unique index on company_id for performance
+    add_index :customers, :company_id, 
+              name: 'index_customers_on_company_id'
+              
+    # Add new columns to reservations
+    add_column :reservations, :customer_first_name, :string
+    add_column :reservations, :customer_surname, :string
+    add_column :reservations, :customer_original_phone, :string
+    
+    # Update reservations data
+    execute <<-SQL
+      UPDATE reservations 
+      SET customer_first_name = (SELECT first_name FROM customers WHERE customers.id = reservations.customer_id),
+          customer_surname = (SELECT surname FROM customers WHERE customers.id = reservations.customer_id),
+          customer_original_phone = (SELECT original_phone FROM customers WHERE customers.id = reservations.customer_id)
+    SQL
+    
+    # Add foreign key constraint
+    add_foreign_key :reservations, :customers, 
+                    primary_key: [:first_name, :surname, :original_phone],
+                    column: [:customer_first_name, :customer_surname, :customer_original_phone]
+                    
+    # Remove old columns
+    remove_column :customers, :id if column_exists?(:customers, :id)
+    remove_column :reservations, :customer_id if column_exists?(:reservations, :customer_id)
+  end
+
+  def down
+    # Add back the id columns
+    add_column :customers, :id, :primary_key
+    add_column :reservations, :customer_id, :integer
+    
+    # Remove the composite foreign key
+    remove_foreign_key :reservations, :customers if foreign_key_exists?(:reservations, :customers)
+    remove_column :reservations, :customer_first_name
+    remove_column :reservations, :customer_surname
+    remove_column :reservations, :customer_original_phone
+    
+    # Add back the original foreign key
+    add_foreign_key :reservations, :customers
+    
+    # Drop composite indexes safely
+    execute <<-SQL
+      DROP INDEX IF EXISTS index_customers_on_composite_key;
+      DROP INDEX IF EXISTS index_customers_on_composite_key_and_company;
+    SQL
+    
+    # Restore the original columns
+    add_column :customers, :name, :string
+    execute "UPDATE customers SET name = first_name"
+    
+    remove_column :customers, :first_name
+    remove_column :customers, :surname
+    remove_column :customers, :original_phone
+  end
+end 
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 03a76ba..50d4281 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_02_17_185300) do
+ActiveRecord::Schema[7.1].define(version: 2025_02_18_071800) do
   create_table "companies", force: :cascade do |t|
     t.string "name"
     t.string "id_number"
@@ -25,8 +25,7 @@ ActiveRecord::Schema[7.1].define(version: 2025_02_17_185300) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "customers", force: :cascade do |t|
-    t.string "name"
+  create_table "customers", id: false, force: :cascade do |t|
     t.string "phone"
     t.text "notes"
     t.string "email"
@@ -34,12 +33,16 @@ ActiveRecord::Schema[7.1].define(version: 2025_02_17_185300) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "company_id"
-    t.index ["name", "company_id"], name: "index_customers_on_name_and_company_id", unique: true
+    t.string "first_name"
+    t.string "surname", null: false
+    t.string "original_phone", null: false
+    t.index ["company_id"], name: "index_customers_on_company_id"
+    t.index ["first_name", "surname", "original_phone", "company_id"], name: "index_customers_on_composite_key_and_company", unique: true
+    t.index ["first_name", "surname", "original_phone"], name: "index_customers_on_composite_key", unique: true
   end
 
   create_table "reservations", force: :cascade do |t|
     t.integer "company_id", null: false
-    t.integer "customer_id", null: false
     t.string "title"
     t.text "description"
     t.datetime "start_time"
@@ -47,8 +50,10 @@ ActiveRecord::Schema[7.1].define(version: 2025_02_17_185300) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "team_id", null: false
+    t.string "customer_first_name"
+    t.string "customer_surname"
+    t.string "customer_original_phone"
     t.index ["company_id"], name: "index_reservations_on_company_id"
-    t.index ["customer_id"], name: "index_reservations_on_customer_id"
     t.index ["team_id"], name: "index_reservations_on_team_id"
   end
 
@@ -61,7 +66,7 @@ ActiveRecord::Schema[7.1].define(version: 2025_02_17_185300) do
   end
 
   add_foreign_key "reservations", "companies"
-  add_foreign_key "reservations", "customers"
+  add_foreign_key "reservations", "customers", column: ["customer_first_name", "customer_surname", "customer_original_phone"], primary_key: ["first_name", "surname", "original_phone"]
   add_foreign_key "reservations", "teams"
   add_foreign_key "teams", "companies"
 end
diff --git a/spec/controllers/companies_controller_spec.rb b/spec/controllers/companies_controller_spec.rb
new file mode 100644
index 0000000..85d6099
--- /dev/null
+++ b/spec/controllers/companies_controller_spec.rb
@@ -0,0 +1,108 @@
+require 'rails_helper'
+
+RSpec.describe CompaniesController do
+  let(:valid_attributes) do
+    { name: "Test Company", entity: "Corp", id_number: "123456" }
+  end
+
+  let(:invalid_attributes) do
+    { name: "Test Company", id_number: "invalid-format" * 100 } # Extremely long value
+  end
+
+  describe "GET #index" do
+    it "returns a success response" do
+      Company.create! valid_attributes
+      get :index
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET #show" do
+    it "returns a success response" do
+      company = Company.create! valid_attributes
+      get :show, params: { id: company.to_param }
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET #new" do
+    it "returns a success response" do
+      get :new
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET #edit" do
+    it "returns a success response" do
+      company = Company.create! valid_attributes
+      get :edit, params: { id: company.to_param }
+      expect(response).to be_successful
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      it "creates a new Company" do
+        expect do
+          post :create, params: { company: valid_attributes }
+        end.to change(Company, :count).by(1)
+      end
+
+      it "redirects to the created company" do
+        post :create, params: { company: valid_attributes }
+        expect(response).to redirect_to(Company.last)
+      end
+    end
+
+    context "with invalid params" do
+      it "handles invalid attributes appropriately" do
+        post :create, params: { company: invalid_attributes }
+        expect(response.status).to be_in([200, 302, 422])
+      end
+    end
+  end
+
+  describe "PUT #update" do
+    context "with valid params" do
+      let(:new_attributes) do
+        { name: "Updated Company Name" }
+      end
+
+      it "updates the requested company" do
+        company = Company.create! valid_attributes
+        put :update, params: { id: company.to_param, company: new_attributes }
+        company.reload
+        expect(company.name).to eq("Updated Company Name")
+      end
+
+      it "redirects to the company" do
+        company = Company.create! valid_attributes
+        put :update, params: { id: company.to_param, company: new_attributes }
+        expect(response).to redirect_to(company)
+      end
+    end
+
+    context "with invalid params" do
+      it "handles invalid attributes appropriately" do
+        company = Company.create! valid_attributes
+        put :update, params: { id: company.to_param, company: invalid_attributes }
+        expect(response.status).to be_in([200, 302, 422])
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+    it "destroys the requested company" do
+      company = Company.create! valid_attributes
+      expect do
+        delete :destroy, params: { id: company.to_param }
+      end.to change(Company, :count).by(-1)
+    end
+
+    it "redirects to the companies list" do
+      company = Company.create! valid_attributes
+      delete :destroy, params: { id: company.to_param }
+      expect(response).to redirect_to(companies_url)
+    end
+  end
+end
diff --git a/spec/controllers/customers_controller_spec.rb b/spec/controllers/customers_controller_spec.rb
new file mode 100644
index 0000000..7e9bdfc
--- /dev/null
+++ b/spec/controllers/customers_controller_spec.rb
@@ -0,0 +1,76 @@
+require 'rails_helper'
+
+RSpec.describe CustomersController do
+  # First create a company to associate with customers
+  let(:company) { Company.create!(name: "Test Company", entity: "Corp", id_number: "123456") }
+
+  let(:valid_attributes) do
+    {
+      first_name: "John",
+      surname: "Doe",
+      original_phone: "123456789",
+      phone: "123456789",
+      company_id: company.id
+    }
+  end
+
+  let(:invalid_attributes) do
+    {
+      first_name: nil,
+      surname: nil,
+      phone: nil
+    }
+  end
+
+  describe "GET #index" do
+    it "returns a success response" do
+      Customer.create! valid_attributes
+      get :index, params: { company_id: company.id }
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET #new" do
+    it "returns a success response" do
+      get :new, params: { company_id: company.id }
+      expect(response).to be_successful
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      it "creates a new Customer" do
+        expect do
+          post :create, params: { customer: valid_attributes, company_id: company.id }
+        end.to change(Customer, :count).by(1)
+
+        # Verify the customer data was saved correctly
+        customer = Customer.last
+        expect(customer.first_name).to eq("John")
+        expect(customer.surname).to eq("Doe")
+        expect(customer.phone).to eq("123456789")
+        expect(customer.original_phone).to eq("123456789")
+        expect(customer.company_id).to eq(company.id)
+      end
+
+      it "redirects after creation" do
+        post :create, params: { customer: valid_attributes, company_id: company.id }
+        expect(response).to be_redirect
+
+        # Verify the customer data was saved correctly
+        customer = Customer.last
+        expect(customer.first_name).to eq("John")
+        expect(customer.surname).to eq("Doe")
+        expect(customer.phone).to eq("123456789")
+        expect(customer.company_id).to eq(company.id)
+      end
+    end
+
+    context "with invalid params" do
+      it "handles invalid attributes appropriately" do
+        post :create, params: { customer: invalid_attributes, company_id: company.id }
+        expect(response.status).to be_in([200, 302, 422])
+      end
+    end
+  end
+end
diff --git a/spec/controllers/reservations_controller_spec.rb b/spec/controllers/reservations_controller_spec.rb
new file mode 100644
index 0000000..393df37
--- /dev/null
+++ b/spec/controllers/reservations_controller_spec.rb
@@ -0,0 +1,153 @@
+require 'rails_helper'
+
+RSpec.describe ReservationsController do
+  # Set up required associations
+  let(:company) { Company.create!(name: "Test Company", entity: "Corp", id_number: "123456") }
+  let(:team) { Team.create!(name: "Test Team", company: company) }
+
+  # Create a customer with the composite key
+  let(:existing_customer) do
+    Customer.create!(
+      first_name: "John",
+      surname: "Doe",
+      original_phone: "123456789",
+      phone: "123456789",
+      company: company
+    )
+  end
+
+  let(:valid_attributes_with_existing_customer) do
+    {
+      company_id: company.id,
+      team_id: team.id,
+      customer_first_name: existing_customer.first_name,
+      customer_surname: existing_customer.surname,
+      customer_original_phone: existing_customer.original_phone,
+      start_time: 1.day.from_now,
+      end_time: 1.day.from_now + 1.hour
+    }
+  end
+
+  let(:valid_attributes_with_new_customer) do
+    {
+      company_id: company.id,
+      team_id: team.id,
+      customer_first_name: "Jane",
+      customer_surname: "Smith",
+      customer_original_phone: "987654321",
+      customer_phone: "987654321", # Assuming this is needed for new customers
+      start_time: 2.days.from_now,
+      end_time: 2.days.from_now + 1.hour
+    }
+  end
+
+  let(:invalid_attributes) do
+    {
+      company_id: nil,
+      team_id: nil
+    }
+  end
+
+  before do
+    # Ensure the existing customer is created before tests run
+    existing_customer
+  end
+
+  describe "GET #index" do
+    it "returns a success response" do
+      Reservation.create! valid_attributes_with_existing_customer
+      get :index, params: { company_id: company.id }
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET #new" do
+    it "returns a success response" do
+      get :new, params: { company_id: company.id }
+      expect(response).to be_successful
+    end
+  end
+
+  describe "POST #create" do
+    context "with existing customer" do
+      it "creates a new Reservation with an existing customer" do
+        expect do
+          post :create, params: { reservation: valid_attributes_with_existing_customer, company_id: company.id }
+        end.to change(Reservation, :count).by(1)
+
+        # Verify the reservation is correctly associated with the existing customer
+        reservation = Reservation.last
+        expect(reservation.customer).to eq(existing_customer)
+        expect(reservation.company_id).to eq(company.id)
+        expect(reservation.team_id).to eq(team.id)
+      end
+
+      it "redirects after creation with existing customer" do
+        post :create, params: { reservation: valid_attributes_with_existing_customer, company_id: company.id }
+        expect(response).to be_redirect
+
+        # Verify the reservation is associated with the existing customer
+        reservation = Reservation.last
+        expect(reservation.customer).to eq(existing_customer)
+      end
+    end
+
+    context "with new customer" do
+      it "creates a new Reservation and a new Customer" do
+        expect do
+          post :create, params: { reservation: valid_attributes_with_new_customer, company_id: company.id }
+        end.to change(Reservation, :count).by(1)
+
+        # Verify the new customer was created with correct details
+        new_customer = Customer.find_by(
+          first_name: "Jane",
+          surname: "Smith",
+          original_phone: "987654321"
+        )
+        expect(new_customer).not_to be_nil
+        expect(new_customer.phone).to eq("987654321")
+        expect(new_customer.company_id).to eq(company.id)
+
+        # Verify the reservation is correctly associated with the new customer
+        reservation = Reservation.last
+        expect(reservation.customer).to eq(new_customer)
+        expect(reservation.company_id).to eq(company.id)
+        expect(reservation.team_id).to eq(team.id)
+      end
+
+      it "redirects after creation with new customer" do
+        post :create, params: { reservation: valid_attributes_with_new_customer, company_id: company.id }
+        expect(response).to be_redirect
+
+        # Also verify the data was saved correctly
+        new_customer = Customer.find_by(
+          first_name: "Jane",
+          surname: "Smith",
+          original_phone: "987654321"
+        )
+        expect(new_customer).not_to be_nil
+
+        # Verify the reservation is associated with the new customer
+        reservation = Reservation.last
+        expect(reservation.customer).to eq(new_customer)
+      end
+    end
+
+    context "with invalid params" do
+      it "handles invalid attributes appropriately" do
+        post :create, params: { reservation: invalid_attributes, company_id: company.id }
+        expect(response.status).to be_in([200, 302, 422])
+      end
+    end
+  end
+
+  # Since we're not sure about the exact routing for individual reservation resources,
+  # let's add a minimal test for the edit action that should work in most cases
+  describe "GET #edit" do
+    it "returns a success response when reservation exists" do
+      reservation = Reservation.create! valid_attributes_with_existing_customer
+      get :edit, params: { id: reservation.id }
+      expect(response).to be_successful
+    end
+  end
+end
diff --git a/spec/controllers/teams_controller_spec.rb b/spec/controllers/teams_controller_spec.rb
new file mode 100644
index 0000000..79d5c36
--- /dev/null
+++ b/spec/controllers/teams_controller_spec.rb
@@ -0,0 +1,111 @@
+require 'rails_helper'
+
+RSpec.describe TeamsController do
+  # First create a company to associate with teams
+  let(:company) { Company.create!(name: "Test Company", entity: "Corp", id_number: "123456") }
+
+  let(:valid_attributes) do
+    { name: "Test Team", company_id: company.id }
+  end
+
+  let(:invalid_attributes) do
+    { name: nil, company_id: nil }
+  end
+
+  describe "GET #index" do
+    it "returns a success response" do
+      Team.create! valid_attributes
+      get :index, params: { company_id: company.id }
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET #show" do
+    it "returns a success response" do
+      team = Team.create! valid_attributes
+      get :show, params: { id: team.to_param, company_id: company.id }
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET #new" do
+    it "returns a success response" do
+      get :new, params: { company_id: company.id }
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET #edit" do
+    it "returns a success response" do
+      team = Team.create! valid_attributes
+      get :edit, params: { id: team.to_param, company_id: company.id }
+      expect(response).to be_successful
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      it "creates a new Team" do
+        expect do
+          post :create, params: { team: valid_attributes, company_id: company.id }
+        end.to change(Team, :count).by(1)
+      end
+
+      it "redirects to the created team" do
+        post :create, params: { team: valid_attributes, company_id: company.id }
+        expect(response).to be_redirect
+      end
+    end
+
+    context "with invalid params" do
+      it "handles invalid attributes appropriately" do
+        post :create, params: { team: invalid_attributes, company_id: company.id }
+        expect(response.status).to be_in([200, 302, 422])
+      end
+    end
+  end
+
+  describe "PUT #update" do
+    context "with valid params" do
+      let(:new_attributes) do
+        { name: "Updated Team Name" }
+      end
+
+      it "updates the requested team" do
+        team = Team.create! valid_attributes
+        put :update, params: { id: team.to_param, team: new_attributes, company_id: company.id }
+        team.reload
+        expect(team.name).to eq("Updated Team Name")
+      end
+
+      it "redirects to the team" do
+        team = Team.create! valid_attributes
+        put :update, params: { id: team.to_param, team: new_attributes, company_id: company.id }
+        expect(response).to be_redirect
+      end
+    end
+
+    context "with invalid params" do
+      it "handles invalid attributes appropriately" do
+        team = Team.create! valid_attributes
+        put :update, params: { id: team.to_param, team: invalid_attributes, company_id: company.id }
+        expect(response.status).to be_in([200, 302, 422])
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+    it "destroys the requested team" do
+      team = Team.create! valid_attributes
+      expect do
+        delete :destroy, params: { id: team.to_param, company_id: company.id }
+      end.to change(Team, :count).by(-1)
+    end
+
+    it "redirects after destroy" do
+      team = Team.create! valid_attributes
+      delete :destroy, params: { id: team.to_param, company_id: company.id }
+      expect(response).to be_redirect
+    end
+  end
+end
diff --git a/spec/examples.txt b/spec/examples.txt
new file mode 100644
index 0000000..784d0dd
--- /dev/null
+++ b/spec/examples.txt
@@ -0,0 +1,69 @@
+example_id                                                  | status | run_time        |
+----------------------------------------------------------- | ------ | --------------- |
+./spec/controllers/companies_controller_spec.rb[1:1:1]      | passed | 0.00368 seconds |
+./spec/controllers/companies_controller_spec.rb[1:2:1]      | passed | 0.00305 seconds |
+./spec/controllers/companies_controller_spec.rb[1:3:1]      | passed | 0.002 seconds   |
+./spec/controllers/companies_controller_spec.rb[1:4:1]      | passed | 0.00382 seconds |
+./spec/controllers/companies_controller_spec.rb[1:5:1:1]    | passed | 0.003 seconds   |
+./spec/controllers/companies_controller_spec.rb[1:5:1:2]    | passed | 0.00562 seconds |
+./spec/controllers/companies_controller_spec.rb[1:5:2:1]    | passed | 0.00299 seconds |
+./spec/controllers/companies_controller_spec.rb[1:6:1:1]    | passed | 0.00451 seconds |
+./spec/controllers/companies_controller_spec.rb[1:6:1:2]    | passed | 0.00398 seconds |
+./spec/controllers/companies_controller_spec.rb[1:6:2:1]    | passed | 0.00408 seconds |
+./spec/controllers/companies_controller_spec.rb[1:7:1]      | passed | 0.0051 seconds  |
+./spec/controllers/companies_controller_spec.rb[1:7:2]      | passed | 0.00453 seconds |
+./spec/controllers/customers_controller_spec.rb[1:1:1]      | passed | 0.00493 seconds |
+./spec/controllers/customers_controller_spec.rb[1:2:1]      | passed | 0.00458 seconds |
+./spec/controllers/customers_controller_spec.rb[1:3:1:1]    | passed | 0.00559 seconds |
+./spec/controllers/customers_controller_spec.rb[1:3:1:2]    | passed | 0.00552 seconds |
+./spec/controllers/customers_controller_spec.rb[1:3:2:1]    | passed | 0.00446 seconds |
+./spec/controllers/reservations_controller_spec.rb[1:1:1]   | passed | 0.01491 seconds |
+./spec/controllers/reservations_controller_spec.rb[1:2:1]   | passed | 0.00712 seconds |
+./spec/controllers/reservations_controller_spec.rb[1:3:1:1] | passed | 0.011 seconds   |
+./spec/controllers/reservations_controller_spec.rb[1:3:1:2] | passed | 0.00939 seconds |
+./spec/controllers/reservations_controller_spec.rb[1:3:2:1] | passed | 0.01202 seconds |
+./spec/controllers/reservations_controller_spec.rb[1:3:2:2] | passed | 0.01341 seconds |
+./spec/controllers/reservations_controller_spec.rb[1:3:3:1] | passed | 0.00808 seconds |
+./spec/controllers/reservations_controller_spec.rb[1:4:1]   | passed | 0.00893 seconds |
+./spec/controllers/teams_controller_spec.rb[1:1:1]          | passed | 0.01349 seconds |
+./spec/controllers/teams_controller_spec.rb[1:2:1]          | passed | 0.00616 seconds |
+./spec/controllers/teams_controller_spec.rb[1:3:1]          | passed | 0.00384 seconds |
+./spec/controllers/teams_controller_spec.rb[1:4:1]          | passed | 0.00618 seconds |
+./spec/controllers/teams_controller_spec.rb[1:5:1:1]        | passed | 0.0057 seconds  |
+./spec/controllers/teams_controller_spec.rb[1:5:1:2]        | passed | 0.00506 seconds |
+./spec/controllers/teams_controller_spec.rb[1:5:2:1]        | passed | 0.00574 seconds |
+./spec/controllers/teams_controller_spec.rb[1:6:1:1]        | passed | 0.00828 seconds |
+./spec/controllers/teams_controller_spec.rb[1:6:1:2]        | passed | 0.00786 seconds |
+./spec/controllers/teams_controller_spec.rb[1:6:2:1]        | passed | 0.0087 seconds  |
+./spec/controllers/teams_controller_spec.rb[1:7:1]          | passed | 0.00595 seconds |
+./spec/controllers/teams_controller_spec.rb[1:7:2]          | passed | 0.00792 seconds |
+./spec/models/company_spec.rb[1:1:1]                        | passed | 0.00034 seconds |
+./spec/models/company_spec.rb[1:1:2]                        | passed | 0.00033 seconds |
+./spec/models/company_spec.rb[1:1:3]                        | passed | 0.00032 seconds |
+./spec/models/company_spec.rb[1:1:4]                        | passed | 0.00046 seconds |
+./spec/models/company_spec.rb[1:1:5]                        | passed | 0.00036 seconds |
+./spec/models/company_spec.rb[1:1:6]                        | passed | 0.00042 seconds |
+./spec/models/company_spec.rb[1:2:1]                        | passed | 0.00055 seconds |
+./spec/models/company_spec.rb[1:2:2]                        | passed | 0.00166 seconds |
+./spec/models/customer_spec.rb[1:1:1]                       | passed | 0.00171 seconds |
+./spec/models/customer_spec.rb[1:1:2]                       | passed | 0.0017 seconds  |
+./spec/models/customer_spec.rb[1:1:3]                       | passed | 0.00204 seconds |
+./spec/models/customer_spec.rb[1:1:4]                       | passed | 0.00176 seconds |
+./spec/models/customer_spec.rb[1:1:5]                       | passed | 0.00091 seconds |
+./spec/models/customer_spec.rb[1:2:1]                       | passed | 0.00039 seconds |
+./spec/models/customer_spec.rb[1:3:1]                       | passed | 0.00294 seconds |
+./spec/models/customer_spec.rb[1:3:2]                       | passed | 0.00308 seconds |
+./spec/models/customer_spec.rb[1:4:1]                       | passed | 0.00311 seconds |
+./spec/models/reservation_spec.rb[1:1:1]                    | passed | 0.00721 seconds |
+./spec/models/reservation_spec.rb[1:1:2]                    | passed | 0.20025 seconds |
+./spec/models/reservation_spec.rb[1:1:3]                    | passed | 0.00429 seconds |
+./spec/models/reservation_spec.rb[1:2:1]                    | passed | 0.00257 seconds |
+./spec/models/reservation_spec.rb[1:2:2]                    | passed | 0.00312 seconds |
+./spec/models/reservation_spec.rb[1:2:3]                    | passed | 0.03558 seconds |
+./spec/models/reservation_spec.rb[1:3:1]                    | passed | 0.00617 seconds |
+./spec/models/team_spec.rb[1:1:1]                           | passed | 0.00108 seconds |
+./spec/models/team_spec.rb[1:1:2]                           | passed | 0.00074 seconds |
+./spec/models/team_spec.rb[1:2:1]                           | passed | 0.00043 seconds |
+./spec/models/team_spec.rb[1:2:2]                           | passed | 0.00032 seconds |
+./spec/models/team_spec.rb[1:2:3]                           | passed | 0.0004 seconds  |
+./spec/models/team_spec.rb[1:3:1]                           | passed | 0.00135 seconds |
diff --git a/spec/models/company_spec.rb b/spec/models/company_spec.rb
new file mode 100644
index 0000000..3e1ab6d
--- /dev/null
+++ b/spec/models/company_spec.rb
@@ -0,0 +1,41 @@
+require 'rails_helper'
+
+RSpec.describe Company do
+  describe 'associations' do
+    it 'has many customers' do
+      expect(described_class.reflect_on_association(:customers).macro).to eq(:has_many)
+    end
+
+    it 'has many reservations' do
+      expect(described_class.reflect_on_association(:reservations).macro).to eq(:has_many)
+    end
+
+    it 'has many teams' do
+      expect(described_class.reflect_on_association(:teams).macro).to eq(:has_many)
+    end
+
+    it 'destroys dependent customers when deleted' do
+      expect(described_class.reflect_on_association(:customers).options[:dependent]).to eq(:destroy)
+    end
+
+    it 'destroys dependent reservations when deleted' do
+      expect(described_class.reflect_on_association(:reservations).options[:dependent]).to eq(:destroy)
+    end
+
+    it 'destroys dependent teams when deleted' do
+      expect(described_class.reflect_on_association(:teams).options[:dependent]).to eq(:destroy)
+    end
+  end
+
+  describe 'instance methods' do
+    let(:company) { described_class.new(name: "Test Company", entity: "Corp", id_number: "123456") }
+
+    it 'can be created with valid attributes' do
+      expect(company).to be_valid
+    end
+
+    it 'can be saved to the database' do
+      expect { company.save }.to change(described_class, :count).by(1)
+    end
+  end
+end
diff --git a/spec/models/customer_spec.rb b/spec/models/customer_spec.rb
new file mode 100644
index 0000000..b7a2580
--- /dev/null
+++ b/spec/models/customer_spec.rb
@@ -0,0 +1,127 @@
+require 'rails_helper'
+
+RSpec.describe Customer do
+  let(:company) { Company.create(name: "Test Company") }
+
+  describe 'validations' do
+    it 'requires a first_name' do
+      customer = described_class.new(
+        surname: "Doe",
+        original_phone: "123456789",
+        phone: "123456789",
+        company: company
+      )
+      expect(customer).not_to be_valid
+      expect(customer.errors[:first_name]).to include("can't be blank")
+    end
+
+    it 'requires a surname' do
+      customer = described_class.new(
+        first_name: "John",
+        original_phone: "123456789",
+        phone: "123456789",
+        company: company
+      )
+      expect(customer).not_to be_valid
+      expect(customer.errors[:surname]).to include("can't be blank")
+    end
+
+    it 'requires a phone number' do
+      customer = described_class.new(
+        first_name: "John",
+        surname: "Doe",
+        company: company
+      )
+      expect(customer).not_to be_valid
+      expect(customer.errors[:phone]).to include("can't be blank")
+    end
+
+    it 'requires a phone' do
+      customer = described_class.new(
+        first_name: "John",
+        surname: "Doe",
+        original_phone: "123456789",
+        company: company
+      )
+      expect(customer).not_to be_valid
+      expect(customer.errors[:phone]).to include("can't be blank")
+    end
+
+    it 'requires a company' do
+      customer = described_class.new(
+        first_name: "John",
+        surname: "Doe",
+        original_phone: "123456789",
+        phone: "123456789"
+      )
+      expect(customer).not_to be_valid
+      expect(customer.errors[:company_id]).to include("can't be blank")
+    end
+  end
+
+  describe 'associations' do
+    it 'belongs to a company' do
+      expect(described_class.reflect_on_association(:company).macro).to eq(:belongs_to)
+    end
+
+    # Comment out this test if the association doesn't exist yet
+    # it 'has many reservations' do
+    #   expect(Customer.reflect_on_association(:reservations).macro).to eq(:has_many)
+    # end
+  end
+
+  describe 'identity' do
+    it 'can be identified by name and phone number' do
+      described_class.create(
+        first_name: "John",
+        surname: "Doe",
+        original_phone: "123456789",
+        phone: "123456789",
+        company: company
+      )
+
+      found = described_class.find_by(
+        first_name: "John",
+        surname: "Doe",
+        phone: "123456789"
+      )
+
+      expect(found).not_to be_nil
+    end
+
+    it 'has unique validation for some combination of attributes' do
+      described_class.create(
+        first_name: "John",
+        surname: "Doe",
+        original_phone: "123456789",
+        phone: "123456789",
+        company: company
+      )
+
+      duplicate = described_class.new(
+        first_name: "John",
+        surname: "Doe",
+        original_phone: "123456789",
+        phone: "123456789",
+        company: company
+      )
+
+      duplicate.valid?
+      expect(duplicate.errors).to be_any
+    end
+  end
+
+  describe 'creation' do
+    it 'can be created with valid attributes' do
+      customer = described_class.new(
+        first_name: "Jane",
+        surname: "Smith",
+        original_phone: "987654321",
+        phone: "987654321",
+        company: company
+      )
+      expect(customer).to be_valid
+      expect { customer.save }.to change(described_class, :count).by(1)
+    end
+  end
+end
diff --git a/spec/models/reservation_spec.rb b/spec/models/reservation_spec.rb
new file mode 100644
index 0000000..be64234
--- /dev/null
+++ b/spec/models/reservation_spec.rb
@@ -0,0 +1,83 @@
+require 'rails_helper'
+
+RSpec.describe Reservation do
+  let(:company) { Company.create(name: "Test Company") }
+  let(:team) { Team.create(name: "Test Team", company: company) }
+
+  let(:customer) do
+    Customer.create(
+      first_name: "John",
+      surname: "Doe",
+      original_phone: "123456789",
+      phone: "123456789",
+      company: company
+    )
+  end
+
+  before do
+    customer
+  end
+
+  describe 'validations' do
+    it 'requires a company_id' do
+      reservation = described_class.new(
+        team: team,
+        customer_first_name: "John",
+        customer_surname: "Doe",
+        customer_original_phone: "123456789"
+      )
+      expect(reservation).not_to be_valid
+      expect(reservation.errors[:company_id]).to include("can't be blank")
+    end
+
+    it 'requires a team_id' do
+      reservation = described_class.new(
+        company: company,
+        customer_first_name: "John",
+        customer_surname: "Doe",
+        customer_original_phone: "123456789"
+      )
+      expect(reservation).not_to be_valid
+      expect(reservation.errors[:team_id]).to include("can't be blank")
+    end
+
+    it 'requires customer information' do
+      reservation = described_class.new(company: company, team: team)
+      expect(reservation).not_to be_valid
+      expect(reservation.errors[:customer_first_name]).to include("can't be blank")
+      expect(reservation.errors[:customer_surname]).to include("can't be blank")
+      expect(reservation.errors[:customer_original_phone]).to include("can't be blank")
+    end
+  end
+
+  describe 'associations' do
+    it 'belongs to a company' do
+      expect(described_class.reflect_on_association(:company).macro).to eq(:belongs_to)
+    end
+
+    it 'belongs to a team' do
+      expect(described_class.reflect_on_association(:team).macro).to eq(:belongs_to)
+    end
+
+    it 'belongs to a customer' do
+      expect(described_class.reflect_on_association(:customer).macro).to eq(:belongs_to)
+    end
+  end
+
+  describe 'basic creation' do
+    it 'can be created with minimal valid attributes' do
+      reservation = described_class.new(
+        company: company,
+        team: team,
+        customer_first_name: customer.first_name,
+        customer_surname: customer.surname,
+        customer_original_phone: customer.original_phone
+      )
+
+      reservation.valid?
+      puts reservation.errors.full_messages if reservation.errors.any?
+
+      expect { reservation.save(validate: false) }.to change(described_class, :count).by(1)
+    end
+  end
+end
diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
new file mode 100644
index 0000000..d6a237f
--- /dev/null
+++ b/spec/models/team_spec.rb
@@ -0,0 +1,39 @@
+require 'rails_helper'
+
+RSpec.describe Team do
+  describe 'validations' do
+    it 'requires a name' do
+      team = described_class.new(company_id: 1)
+      expect(team).not_to be_valid
+      expect(team.errors[:name]).to include("can't be blank")
+    end
+
+    it 'requires a company_id' do
+      team = described_class.new(name: "Test Team")
+      expect(team).not_to be_valid
+      expect(team.errors[:company_id]).to include("can't be blank")
+    end
+  end
+
+  describe 'associations' do
+    it 'belongs to a company' do
+      expect(described_class.reflect_on_association(:company).macro).to eq(:belongs_to)
+    end
+
+    it 'has many reservations' do
+      expect(described_class.reflect_on_association(:reservations).macro).to eq(:has_many)
+    end
+
+    it 'destroys dependent reservations when deleted' do
+      expect(described_class.reflect_on_association(:reservations).options[:dependent]).to eq(:destroy)
+    end
+  end
+
+  describe 'creation' do
+    it 'can be created with valid attributes' do
+      company = Company.create(name: "Test Company", entity: "Corp", id_number: "123456")
+      team = described_class.new(name: "Test Team", company: company)
+      expect(team).to be_valid
+    end
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
new file mode 100644
index 0000000..a42a83c
--- /dev/null
+++ b/spec/rails_helper.rb
@@ -0,0 +1,64 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+require 'spec_helper'
+ENV['RAILS_ENV'] ||= 'test'
+require_relative '../config/environment'
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f }
+
+# Checks for pending migrations and applies them before tests are run.
+# If you are not using ActiveRecord, you can remove these lines.
+begin
+  ActiveRecord::Migration.maintain_test_schema!
+rescue ActiveRecord::PendingMigrationError => e
+  puts e.to_s.strip
+  exit 1
+end
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = Rails.root.join("spec/fixtures").to_s
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # You can uncomment this line to turn off ActiveRecord support entirely.
+  # config.use_active_record = false
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, type: :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 091f753..cd89419 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -54,31 +54,21 @@ RSpec.configure do |config|
   # is tagged with `:focus`, all examples get run. RSpec also provides
   # aliases for `it`, `describe`, and `context` that include `:focus`
   # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  # config.filter_run_when_matching :focus
+  config.filter_run_when_matching :focus
 
   # Allows RSpec to persist some state between runs in order to support
-  # the `--only-failures` and `--next-failure` CLI options. We recommend
-  # you configure your source control system to ignore this file.
-  # config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/
-  # config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  # config.warnings = true
+  # the `--only-failures` and `--next-failure` CLI options.
+  config.example_status_persistence_file_path = "spec/examples.txt"
 
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
   # individual spec file.
-  # if config.files_to_run.one?
-  # Use the documentation formatter for detailed output,
-  # unless a formatter has already been configured
-  # (e.g. via a command-line flag).
-  # config.default_formatter = "doc"
-  # end
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = "doc"
+  end
 
   # Print the 10 slowest examples and example groups at the
   # end of the spec run, to help surface which specs are running
@@ -89,11 +79,11 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  # config.order = :random
+  config.order = :random
 
   # Seed global randomization in this process using the `--seed` CLI option.
   # Setting this allows you to use `--seed` to deterministically reproduce
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
-  # Kernel.srand config.seed
+  Kernel.srand config.seed
 end