savedMovements is now a map