Initial checkin - Only highlight functionality added