Initial checkin of nameService version 7