beginning re-coding of services mapping to handle most flexible cases