added most infrastrcture for enquiry sending. Minor changes else