interim checkin after try two different feature alignment approaches.