Activity migration

more work on Activity migration