diff --git a/Locomotives/Locomotives/FormMapWithSetLocomotives.Designer.cs b/Locomotives/Locomotives/FormMapWithSetLocomotives.Designer.cs
index 74cc9e2..bc78814 100644
--- a/Locomotives/Locomotives/FormMapWithSetLocomotives.Designer.cs
+++ b/Locomotives/Locomotives/FormMapWithSetLocomotives.Designer.cs
@@ -29,6 +29,12 @@
         private void InitializeComponent()
         {
             this.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+            this.buttonDeleteMap = new System.Windows.Forms.Button();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.buttonAddMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
@@ -38,14 +44,15 @@
             this.buttonRemoveLocomotive = new System.Windows.Forms.Button();
             this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
             this.buttonAddCar = new System.Windows.Forms.Button();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
             this.pictureBoxLocomotives = new System.Windows.Forms.PictureBox();
             this.groupBoxTools.SuspendLayout();
+            this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotives)).BeginInit();
             this.SuspendLayout();
             // 
             // groupBoxTools
             // 
+            this.groupBoxTools.Controls.Add(this.groupBoxMaps);
             this.groupBoxTools.Controls.Add(this.buttonUp);
             this.groupBoxTools.Controls.Add(this.buttonDown);
             this.groupBoxTools.Controls.Add(this.buttonLeft);
@@ -55,21 +62,85 @@
             this.groupBoxTools.Controls.Add(this.buttonRemoveLocomotive);
             this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
             this.groupBoxTools.Controls.Add(this.buttonAddCar);
-            this.groupBoxTools.Controls.Add(this.comboBoxSelectorMap);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(577, 0);
+            this.groupBoxTools.Location = new System.Drawing.Point(950, 0);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(223, 450);
+            this.groupBoxTools.Size = new System.Drawing.Size(223, 676);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Инструменты";
             // 
+            // groupBoxMaps
+            // 
+            this.groupBoxMaps.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxMaps.Location = new System.Drawing.Point(6, 18);
+            this.groupBoxMaps.Name = "groupBoxMaps";
+            this.groupBoxMaps.Size = new System.Drawing.Size(217, 267);
+            this.groupBoxMaps.TabIndex = 11;
+            this.groupBoxMaps.TabStop = false;
+            this.groupBoxMaps.Text = "Карты";
+            // 
+            // buttonDeleteMap
+            // 
+            this.buttonDeleteMap.Location = new System.Drawing.Point(25, 235);
+            this.buttonDeleteMap.Name = "buttonDeleteMap";
+            this.buttonDeleteMap.Size = new System.Drawing.Size(164, 26);
+            this.buttonDeleteMap.TabIndex = 14;
+            this.buttonDeleteMap.Text = "Удалить карту";
+            this.buttonDeleteMap.UseVisualStyleBackColor = true;
+            this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 15;
+            this.listBoxMaps.Location = new System.Drawing.Point(25, 112);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(164, 109);
+            this.listBoxMaps.TabIndex = 13;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // buttonAddMap
+            // 
+            this.buttonAddMap.Location = new System.Drawing.Point(25, 80);
+            this.buttonAddMap.Name = "buttonAddMap";
+            this.buttonAddMap.Size = new System.Drawing.Size(164, 26);
+            this.buttonAddMap.TabIndex = 12;
+            this.buttonAddMap.Text = "Добавить карту";
+            this.buttonAddMap.UseVisualStyleBackColor = true;
+            this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(25, 22);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(164, 23);
+            this.textBoxNewMapName.TabIndex = 0;
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Карта с крестом",
+            "Карта с дорожками"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(25, 51);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(164, 23);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            // 
             // buttonUp
             // 
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::Locomotives.Properties.Resources.ArrowUp;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(107, 378);
+            this.buttonUp.Location = new System.Drawing.Point(107, 604);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 10;
@@ -81,7 +152,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::Locomotives.Properties.Resources.ArrowDown;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(107, 414);
+            this.buttonDown.Location = new System.Drawing.Point(107, 640);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 9;
@@ -93,7 +164,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::Locomotives.Properties.Resources.ArrowLeft;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(71, 414);
+            this.buttonLeft.Location = new System.Drawing.Point(71, 640);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 8;
@@ -105,7 +176,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::Locomotives.Properties.Resources.ArrowRight;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(143, 414);
+            this.buttonRight.Location = new System.Drawing.Point(143, 640);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 7;
@@ -114,7 +185,7 @@
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(31, 314);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(31, 426);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(164, 26);
             this.buttonShowOnMap.TabIndex = 5;
@@ -124,7 +195,7 @@
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(31, 217);
+            this.buttonShowStorage.Location = new System.Drawing.Point(31, 394);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(164, 26);
             this.buttonShowStorage.TabIndex = 4;
@@ -134,7 +205,7 @@
             // 
             // buttonRemoveLocomotive
             // 
-            this.buttonRemoveLocomotive.Location = new System.Drawing.Point(31, 156);
+            this.buttonRemoveLocomotive.Location = new System.Drawing.Point(31, 362);
             this.buttonRemoveLocomotive.Name = "buttonRemoveLocomotive";
             this.buttonRemoveLocomotive.Size = new System.Drawing.Size(164, 26);
             this.buttonRemoveLocomotive.TabIndex = 3;
@@ -144,7 +215,7 @@
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(31, 127);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(31, 333);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             this.maskedTextBoxPosition.Size = new System.Drawing.Size(164, 23);
@@ -152,7 +223,7 @@
             // 
             // buttonAddCar
             // 
-            this.buttonAddCar.Location = new System.Drawing.Point(31, 72);
+            this.buttonAddCar.Location = new System.Drawing.Point(31, 291);
             this.buttonAddCar.Name = "buttonAddCar";
             this.buttonAddCar.Size = new System.Drawing.Size(164, 26);
             this.buttonAddCar.TabIndex = 1;
@@ -160,26 +231,12 @@
             this.buttonAddCar.UseVisualStyleBackColor = true;
             this.buttonAddCar.Click += new System.EventHandler(this.ButtonAddLocomotive_Click);
             // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Карта с крестом",
-            "Карта с дорожками"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(31, 22);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(164, 23);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
             // pictureBoxLocomotives
             // 
             this.pictureBoxLocomotives.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBoxLocomotives.Location = new System.Drawing.Point(0, 0);
             this.pictureBoxLocomotives.Name = "pictureBoxLocomotives";
-            this.pictureBoxLocomotives.Size = new System.Drawing.Size(577, 450);
+            this.pictureBoxLocomotives.Size = new System.Drawing.Size(950, 676);
             this.pictureBoxLocomotives.TabIndex = 1;
             this.pictureBoxLocomotives.TabStop = false;
             // 
@@ -187,13 +244,15 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.ClientSize = new System.Drawing.Size(1173, 676);
             this.Controls.Add(this.pictureBoxLocomotives);
             this.Controls.Add(this.groupBoxTools);
             this.Name = "FormMapWithSetLocomotives";
             this.Text = "Карта с набором объектов";
             this.groupBoxTools.ResumeLayout(false);
             this.groupBoxTools.PerformLayout();
+            this.groupBoxMaps.ResumeLayout(false);
+            this.groupBoxMaps.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotives)).EndInit();
             this.ResumeLayout(false);
 
@@ -213,5 +272,10 @@
         private Button buttonDown;
         private Button buttonLeft;
         private Button buttonRight;
+        private GroupBox groupBoxMaps;
+        private Button buttonDeleteMap;
+        private ListBox listBoxMaps;
+        private Button buttonAddMap;
+        private TextBox textBoxNewMapName;
     }
 }
\ No newline at end of file
diff --git a/Locomotives/Locomotives/FormMapWithSetLocomotives.cs b/Locomotives/Locomotives/FormMapWithSetLocomotives.cs
index 9b1e87c..db2e33c 100644
--- a/Locomotives/Locomotives/FormMapWithSetLocomotives.cs
+++ b/Locomotives/Locomotives/FormMapWithSetLocomotives.cs
@@ -6,48 +6,103 @@
     public partial class FormMapWithSetLocomotives : Form
     {
         /// <summary>
-        /// Объект от класса карты с набором объектов
+        /// Словарь для выпадающего списка
         /// </summary>
-        private MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> _mapCarsCollectionGeneric;
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
+        {
+            {"Простая карта", new SimpleMap()},
+            {"Карта с крестом", new CrossMap()},
+            {"Карта с дорожками", new RoadsMap()},
+        };
+        /// <summary>
+        /// Объект от коллекции карт
+        /// </summary>
+        private readonly MapsCollection _mapsCollection;
         /// <summary>
         /// Конструктор
         /// </summary>
         public FormMapWithSetLocomotives()
         {
             InitializeComponent();
+            _mapsCollection = new MapsCollection(pictureBoxLocomotives.Width, pictureBoxLocomotives.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach (var elem in _mapsDict)
+            {
+                comboBoxSelectorMap.Items.Add(elem.Key);
+            }
+        }
+        /// <summary>
+        /// Заполнение listBoxMaps
+        /// </summary>
+        private void ReloadMaps()
+        {
+            int index = listBoxMaps.SelectedIndex;
+            listBoxMaps.Items.Clear();
+            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+            {
+                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
+            }
+            if (listBoxMaps.Items.Count > 0 && (index == -1 || index >=
+           listBoxMaps.Items.Count))
+            {
+                listBoxMaps.SelectedIndex = 0;
+            }
+            else if (listBoxMaps.Items.Count > 0 && index > -1 && index <
+           listBoxMaps.Items.Count)
+            {
+                listBoxMaps.SelectedIndex = index;
+            }
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonAddMap_Click(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
+            textBoxNewMapName.Text = "";
+            ReloadMaps();
         }
         /// <summary>
         /// Выбор карты
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
         {
-            AbstractMap map = null;
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    map = new SimpleMap();
-                    break;
-                case "Карта с крестом":
-                    map = new CrossMap();
-                    break;
-                case "Карта с дорожками":
-                    map = new RoadsMap();
-                    break;
-                default:
-                    break;
-            }
-            if (map != null)
-            {
-                _mapCarsCollectionGeneric = new
-               MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>(pictureBoxLocomotives.Width, pictureBoxLocomotives.Height, map);
-            }
-            else
-            {
-                _mapCarsCollectionGeneric = null;
-            }
+            pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
         }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
+            }
+            MessageBox.Show("Карта удалена");
+        }
+
         /// <summary>
         /// Добавление объекта
         /// </summary>
@@ -55,7 +110,7 @@
         /// <param name="e"></param>
         private void ButtonAddLocomotive_Click(object sender, EventArgs e)
         {
-            if (_mapCarsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -63,10 +118,10 @@
             if (form.ShowDialog() == DialogResult.OK)
             {
                 DrawningObjectLocomotive locomotive = new(form.SelectedLocomotive);
-                if ((_mapCarsCollectionGeneric + locomotive) > -1)
+                if ((_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + locomotive) > -1)
                 {
                     MessageBox.Show("Объект добавлен");
-                    pictureBoxLocomotives.Image = _mapCarsCollectionGeneric.ShowSet();
+                    pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
                 }
                 else
                 {
@@ -81,6 +136,10 @@
         /// <param name="e"></param>
         private void ButtonRemoveLocomotive_Click(object sender, EventArgs e)
         {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
             if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
@@ -90,15 +149,16 @@
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if ((_mapCarsCollectionGeneric - pos) > -1)
+            if ((_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos) > -1)
             {
                 MessageBox.Show("Объект удален");
-                pictureBoxLocomotives.Image = _mapCarsCollectionGeneric.ShowSet();
+                pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
             else
             {
                 MessageBox.Show("Не удалось удалить объект");
             }
+
         }
         /// <summary>
         /// Вывод набора
@@ -107,11 +167,11 @@
         /// <param name="e"></param>
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (_mapCarsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBoxLocomotives.Image = _mapCarsCollectionGeneric.ShowSet();
+            pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
         }
         /// <summary>
         /// Вывод карты
@@ -120,11 +180,11 @@
         /// <param name="e"></param>
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if (_mapCarsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBoxLocomotives.Image = _mapCarsCollectionGeneric.ShowOnMap();
+            pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
         }
         /// <summary>
         /// Перемещение
@@ -133,7 +193,7 @@
         /// <param name="e"></param>
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (_mapCarsCollectionGeneric == null)
+            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -155,7 +215,7 @@
                     dir = Direction.Right;
                     break;
             }
-            pictureBoxLocomotives.Image = _mapCarsCollectionGeneric.MoveObject(dir);
+            pictureBoxLocomotives.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
         }
     }
 }
diff --git a/Locomotives/Locomotives/MapWithSetLocomotivesGeneric.cs b/Locomotives/Locomotives/MapWithSetLocomotivesGeneric.cs
index e26b025..08f71f9 100644
--- a/Locomotives/Locomotives/MapWithSetLocomotivesGeneric.cs
+++ b/Locomotives/Locomotives/MapWithSetLocomotivesGeneric.cs
@@ -82,13 +82,9 @@
         public Bitmap ShowOnMap()
         {
             Shaking();
-            for (int i = 0; i < _setLocomotives.Count; i++)
+            foreach (var locomotive in _setLocomotives.GetLocomotives())
             {
-                var locomotive = _setLocomotives.Get(i);
-                if (locomotive != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, locomotive);
-                }
+                return _map.CreateMap(_pictureWidth, _pictureHeight, locomotive);
             }
             return new(_pictureWidth, _pictureHeight);
         }
@@ -113,11 +109,11 @@
             int j = _setLocomotives.Count - 1;
             for (int i = 0; i < _setLocomotives.Count; i++)
             {
-                if (_setLocomotives.Get(i) == null)
+                if (_setLocomotives[i] == null)
                 {
                     for (; j > i; j--)
                     {
-                        var locomotive = _setLocomotives.Get(j);
+                        var locomotive = _setLocomotives[j];
                         if (locomotive != null)
                         {
                             _setLocomotives.Insert(locomotive, i);
@@ -161,10 +157,11 @@
             int LocomotivesInLine = _pictureWidth / _placeSizeWidth;
             int CurrentVertPos = 20;
             int CurrentHorPos = 0;
-            for (int i = 0; i < _setLocomotives.Count; i++)
+            int CurrentLocomotiveNumber = 0;
+            foreach (var locomotive in _setLocomotives.GetLocomotives())
             {
-                _setLocomotives.Get(i)?.SetObject(CurrentHorPos, CurrentVertPos, _pictureWidth, _pictureHeight);
-                _setLocomotives.Get(i)?.DrawningObject(g);
+                _setLocomotives[CurrentLocomotiveNumber]?.SetObject(CurrentHorPos, CurrentVertPos, _pictureWidth, _pictureHeight);
+                _setLocomotives[CurrentLocomotiveNumber]?.DrawningObject(g);
                 if (CurrentHorPos < LocomotivesInLine)
                 {
                     CurrentHorPos += _placeSizeWidth;
@@ -174,6 +171,7 @@
                     CurrentHorPos = 0;
                     CurrentVertPos += _placeSizeHeight;
                 }
+                CurrentLocomotiveNumber++;
             }
         }
     }
diff --git a/Locomotives/Locomotives/MapsCollection.cs b/Locomotives/Locomotives/MapsCollection.cs
new file mode 100644
index 0000000..700e25c
--- /dev/null
+++ b/Locomotives/Locomotives/MapsCollection.cs
@@ -0,0 +1,66 @@
+namespace Locomotives
+{
+    /// <summary>
+    /// Класс для хранения коллекции карт
+    /// </summary>
+    internal class MapsCollection
+    {
+        /// <summary>
+        /// Словарь (хранилище) с картами
+        /// </summary>
+        readonly Dictionary<string, MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>> _mapStorages;
+        /// <summary>
+        /// Возвращение списка названий карт
+        /// </summary>
+        public List<string> Keys => _mapStorages.Keys.ToList();
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="pictureWidth"></param>
+        /// <param name="pictureHeight"></param>
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorages = new Dictionary<string, MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        /// <summary>
+        /// Добавление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        /// <param name="map">Карта</param>
+        public void AddMap(string name, AbstractMap map)
+        {
+            _mapStorages.Add(name, new MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap>(_pictureWidth, _pictureHeight, map));
+        }
+        /// <summary>
+        /// Удаление карты
+        /// </summary>
+        /// <param name="name">Название карты</param>
+        public void DelMap(string name)
+        {
+            _mapStorages.Remove(name);
+        }
+        /// <summary>
+        /// Доступ к парковке
+        /// </summary>
+        /// <param name="ind"></param>
+        /// <returns></returns>
+        public MapWithSetLocomotivesGeneric<DrawningObjectLocomotive, AbstractMap> this[string ind]
+        {
+            get
+            {
+                return _mapStorages[ind];
+            }
+        }
+    }
+
+}
diff --git a/Locomotives/Locomotives/SetLocomotivesGeneric.cs b/Locomotives/Locomotives/SetLocomotivesGeneric.cs
index 88cee91..96c7182 100644
--- a/Locomotives/Locomotives/SetLocomotivesGeneric.cs
+++ b/Locomotives/Locomotives/SetLocomotivesGeneric.cs
@@ -4,20 +4,22 @@
         where T : class
     {
         /// <summary>
-        /// Массив объектов, которые храним
+        /// Список объектов, которые храним
         /// </summary>
-        private readonly T[] _places;
+        private readonly List<T> _places;
         /// <summary>
-        /// Количество объектов в массиве
+        /// Количество объектов в списке
         /// </summary>
-        public int Count => _places.Length;
+        public int Count => _places.Count;
         /// <summary>
         /// Конструктор
         /// </summary>
         /// <param name="count"></param>
+        private readonly int _maxCount;
         public SetLocomotivesGeneric(int count)
         {
-            _places = new T[count];
+            _maxCount = count;
+            _places = new List<T>();
         }
         /// <summary>
         /// Добавление объекта в набор
@@ -26,24 +28,22 @@
         /// <returns></returns>
         public int Insert(T locomotive)
         {
-            T testLocomotive = _places[0];
-            for (int i = 0; i < Count; i++)
+            if (_places.Count == 0)
             {
-                if (_places[i] == null)
+                _places.Add(locomotive);
+                return 0;
+            }
+            if (Count < _maxCount)
+            {
+                for (int i = Count; i >= 1; i--)
                 {
-                    testLocomotive = _places[i];
+                    _places.Insert(i, _places[i - 1]);
+                    _places.RemoveAt(i - 1);
                 }
+                _places.Insert(0, locomotive);
+                return 0;
             }
-            if (testLocomotive != null)
-            {
-                return -1;
-            }
-            for (int i = Count - 2; i >= 0; i--)
-            {
-                _places[i + 1] = _places[i];
-            }
-            _places[0] = locomotive;
-            return 0;
+            return -1;
         }
         /// <summary>
         /// Добавление объекта в набор на конкретную позицию
@@ -53,26 +53,16 @@
         /// <returns></returns>
         public int Insert(T locomotive, int position)
         {
-            if (position < 0 || position >= Count)
+            if (position < 0 || position > Count + 1)
             {
                 return position;
             }
-            int ClosestNullElementIndex = position;
-            while (_places[ClosestNullElementIndex] != null)
+            if (_places[position] == null)
             {
-                if (ClosestNullElementIndex == Count)
-                {
-                    return position;
-                }
-                ClosestNullElementIndex++;
+                _places.Insert(position, locomotive);
+                return position;
             }
-            while (ClosestNullElementIndex != position)
-            {
-                _places[ClosestNullElementIndex] = _places[ClosestNullElementIndex - 1];
-                ClosestNullElementIndex--;
-            }
-            _places[position] = locomotive;
-            return position;
+            return -1;
         }
         /// <summary>
         /// Удаление объекта из набора с конкретной позиции
@@ -81,11 +71,11 @@
         /// <returns></returns>
         public int Remove(int position)
         {
-            if (_places[position] == null)
+            if (position > Count || _places[position] == null)
             {
                 return -1;
             }
-            _places[position] = null;
+            _places.RemoveAt(position);
             return position;
         }
         /// <summary>
@@ -93,13 +83,41 @@
         /// </summary>
         /// <param name="position"></param>
         /// <returns></returns>
-        public T Get(int position)
+        public T this[int position]
         {
-            if (_places[position] != null)
+            get
             {
-                return _places[position];
+                if (_places[position] != null)
+                {
+                    return _places[position];
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            set
+            {
+                Insert(value, position);
+            }
+        }
+        /// <summary>
+        /// Проход по набору до первого пустого
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<T> GetLocomotives()
+        {
+            foreach (var locomotive in _places)
+            {
+                if (locomotive != null)
+                {
+                    yield return locomotive;
+                }
+                else
+                {
+                    yield break;
+                }
             }
-            return null;
         }
     }
 }