added multihome stuff sort of working