Begin rewrite of NDP-relay