Adding Mover interface, fixed other things.