Working towards location migration