Partially Working User Booking
Merge commit 'b2796fb8efd43d7aff0961ef65806478bf4fa739'