Initial rewrite of NDP proxy