Booking almost finished I hope
Merge errors deleted