First revision towrads live migration
Tests passing, onto travis