Adding a solution for devices moving between IPs

Need to comb through this a bit..