CMapQuestion code review..

CMapQuestion code review .. this is separate branch for code review