finalizing merge of coreys code with EMRServiceModel project