diff --git a/ProjectCruiser/CollectionGenericObj/AbstractCompany.cs b/ProjectCruiser/CollectionGenericObj/AbstractCompany.cs
index 5b98774..fdd5d80 100644
--- a/ProjectCruiser/CollectionGenericObj/AbstractCompany.cs
+++ b/ProjectCruiser/CollectionGenericObj/AbstractCompany.cs
@@ -17,8 +17,8 @@ public abstract class AbstractCompany
 
     // Коллекция автомобилей
     protected ICollectionGenObj<DrawningBase>? _collection = null;
-    private int GetMaxCount => _pictureWidth * _pictureHeight /
-    (_placeSizeWidth * _placeSizeHeight);
+    private int GetMaxCount => (_pictureWidth / (_placeSizeWidth + 20))
+        * ( _pictureHeight / (_placeSizeHeight + 4));
 
     public AbstractCompany(int picWidth, int picHeight,
         ICollectionGenObj<DrawningBase>? collection)
@@ -51,20 +51,22 @@ public abstract class AbstractCompany
         Bitmap bitmap = new(_pictureWidth, _pictureHeight);
         Graphics graphics = Graphics.FromImage(bitmap);
         DrawBackground(graphics);
-        SetObjectsPosition();
-        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+
+        SetObjectsPosition(_collection.Count - 1);
+
+        for (int i = 0; i < (_collection?.Count ?? 0); i++)
         {
             DrawningBase? obj = _collection?.GetItem(i);
             obj?.DrawTransport(graphics);
         }
+
         return bitmap;
     }
 
-
     // Вывод заднего фона
     protected abstract void DrawBackground(Graphics g);
 
     // Расстановка объектов
-    protected abstract void SetObjectsPosition();
+    protected abstract void SetObjectsPosition(int border);
 }
 
diff --git a/ProjectCruiser/CollectionGenericObj/ArrayGenObj.cs b/ProjectCruiser/CollectionGenericObj/ArrayGenObj.cs
index cf2297a..475640a 100644
--- a/ProjectCruiser/CollectionGenericObj/ArrayGenObj.cs
+++ b/ProjectCruiser/CollectionGenericObj/ArrayGenObj.cs
@@ -1,5 +1,4 @@
-
-using ProjectCruiser.Exceptions;
+using ProjectCruiser.Exceptions;
 
 namespace ProjectCruiser.CollectionGenericObj;
 
@@ -11,7 +10,7 @@ public class ArrayGenObj<T> : ICollectionGenObj<T>
 
     // Максимально допустимое число объектов в массиве
     private int _maxCount;
-    public int Count => _collection.Count(s => s != null);
+    public int Count => _collection.Count(s => (s != null));
 
     public int MaxCount
     {
@@ -20,10 +19,10 @@ public class ArrayGenObj<T> : ICollectionGenObj<T>
         {
             if (value > 0)
             {
+                _maxCount = value;
+
                 if (_collection.Length == 0) _collection = new T?[value];
                 else Array.Resize(ref _collection, value);
-
-                _maxCount = value;
             }
         }
     }
@@ -38,140 +37,96 @@ public class ArrayGenObj<T> : ICollectionGenObj<T>
     // methods :
     public T? GetItem(int index)
     {
-        try
-        {
-            if (index > Count)
-                throw new CollectionOverflowException(index);
-            if (index < 0)
-                throw new PositionOutOfCollectionException(index);
+        if (index > _maxCount)
+            throw new CollectionOverflowException(index);
+        if (index < 0)
+            throw new PositionOutOfCollectionException(index);
 
-            if (_collection[index] == null)
-                throw new ObjectNotFoundException(index);
+        if (_collection[index] == null)
+            throw new ObjectNotFoundException(index);
 
-            return _collection[index];
-        }
-        catch (CollectionOverflowException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return null;
-        }
-        catch (ObjectNotFoundException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return null;
-        }
-        catch (PositionOutOfCollectionException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return null;
-        }
+        return _collection[index];
+
+        // CollectionOverflowException
+        // PositionOutOfCollectionException
+        // ObjectNotFoundException
     }
 
     public int Insert(T? item)
     {
-        if (item == null) { return -1; }
+        if (item == null) throw
+                new NullReferenceException("> Inserting item is null");
 
-        try // выход за границы, курируется CollectionOverflowException
-        {
-            if (Count >= _maxCount)
-            {
-                throw new CollectionOverflowException(Count);
-            }
+        // выход за границы, курируется CollectionOverflowException
+        if (Count >= _maxCount) throw new CollectionOverflowException(Count);
 
-            // any empty place -> fill immediately
-            for (int i = 0; i < _collection.Length; i++)
-            {
-                if (_collection[i] == null)
-                {
-                    _collection[i] = item;
-                    return i;
-                }
-            }
-            return Count;
-        }
-        catch (CollectionOverflowException ex)
+        // any empty place -> fill immediately
+        for (int i = Count; i < _maxCount; i++)
         {
-            Console.WriteLine(ex.Message);
-            return -1;
+            if (_collection[i] == null)
+            {
+                _collection[i] = item;
+                return i;
+            }
         }
+        return Count;
+
+        // NullReferenceException
+        // CollectionOverflowException
     }
 
     public int Insert(T? item, int index)
     {
-        try
+        if (index < 0 || index >= _maxCount) throw new PositionOutOfCollectionException(index);
+        if (Count >= _maxCount) throw new CollectionOverflowException(Count);
+
+        if (item == null) throw
+                new NullReferenceException("> Inserting item (at position) is null");
+
+        if (_collection[index] == null)
         {
-            if (index < 0 || index >= _maxCount) throw new PositionOutOfCollectionException(index);
-            if (Count >= _maxCount) throw new CollectionOverflowException(Count);
+            _collection[index] = item;
+            return index;
+        }
+        else
+        {
+            int min_diff = 100, firstNullIndex = 100;
 
-            if (item == null) throw new ObjectNotFoundException(index);
-
-            if (_collection[index] == null)
+            for (int i = 0; i < Count; i++)
             {
-                _collection[index] = item;
-                return index;
-            }
-            else
-            {
-                int min_diff = 100, firstNullIndex = 100;
-
-                for (int i = 0; i < Count; i++)
+                if (_collection[i] == null && min_diff > Math.Abs(index - i))
                 {
-                    if (_collection[i] == null && min_diff > Math.Abs(index - i))
-                    {
-                        min_diff = Math.Abs(index - i);
-                        firstNullIndex = i;
-                    }
+                    min_diff = Math.Abs(index - i);
+                    firstNullIndex = i;
                 }
-
-                _collection[firstNullIndex] = item;
-                return firstNullIndex;
             }
+
+            _collection[firstNullIndex] = item;
+            return firstNullIndex;
         }
-        catch (CollectionOverflowException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return -1;
-        }
-        catch (ObjectNotFoundException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return -1;
-        }
-        catch (PositionOutOfCollectionException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return -1;
-        }
+
+        // PositionOutOfCollectionException
+        // CollectionOverflowException
+        // NullReferenceException
     }
 
     public T? Remove(int index)
     {
-        try
+        if (index >= _maxCount || index < 0)
+        // on the other positions items don't exist
         {
-            if (index >= _maxCount || index < 0)
-            // on the other positions items don't exist
-            {
-                throw new CollectionOverflowException(index);
-                // [?] PositionOutOfCollectionException <<<
-            }
-
-            T? item = _collection[index];
-            _collection[index] = null;
-
-            if (item == null) throw new ObjectNotFoundException(index);
-
-            return item;
-        }
-        catch (CollectionOverflowException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return null;
-        }
-        catch (ObjectNotFoundException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return null;
+            throw new PositionOutOfCollectionException(index);
         }
+
+        T? item = _collection[index];
+        _collection[index] = null;
+
+        if (item == null) throw new ObjectNotFoundException(index);
+
+        return item;
+
+        // PositionOutOfCollectionException
+        // ObjectNotFoundException
     }
 
     public IEnumerable<T?> GetItems()
diff --git a/ProjectCruiser/CollectionGenericObj/ListGenObj.cs b/ProjectCruiser/CollectionGenericObj/ListGenObj.cs
index 3e11e11..1cb23cf 100644
--- a/ProjectCruiser/CollectionGenericObj/ListGenObj.cs
+++ b/ProjectCruiser/CollectionGenericObj/ListGenObj.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-using ProjectCruiser.Exceptions;
+using ProjectCruiser.Exceptions;
 
 namespace ProjectCruiser.CollectionGenericObj;
 
@@ -41,111 +37,56 @@ public class ListGenObj<T> : ICollectionGenObj<T>
 
     public T? GetItem(int position)
     {
-        try
-        {
-            if (position > Count)
-                throw new CollectionOverflowException(position);
-            if (position < 0)
-                throw new PositionOutOfCollectionException(position);
+        if (position > _maxCount)
+            throw new CollectionOverflowException(position);
+        if (position < 0)
+            throw new PositionOutOfCollectionException(position);
 
-            if (_collection[position] == null)
-                throw new ObjectNotFoundException(position);
+        if (_collection[position] == null)
+            throw new ObjectNotFoundException(position);
 
-            return _collection[position];
-        }
-        catch (CollectionOverflowException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return null;
-        }
-        catch (ObjectNotFoundException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return null;
-        }
-        catch (PositionOutOfCollectionException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return null;
-        }
+        return _collection[position];
     }
 
     public int Insert(T? obj)
     {
-        if (obj == null) { return -1; }
+        if (obj == null)
+            throw new NullReferenceException("> Inserting object is null");
 
-        try  // выход за границы, курируется CollectionOverflowException
-        {
-            if (Count >= _maxCount)
-            {
-                throw new CollectionOverflowException(Count);
-            }
+        // выход за границы, курируется CollectionOverflowException
+        if (Count >= _maxCount) throw new CollectionOverflowException(Count);
 
-            _collection.Add(obj);
-            return Count;
-        }
-        catch (CollectionOverflowException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return -1;
-        }
+        _collection.Add(obj);
+        return Count;
     }
 
     public int Insert(T? obj, int position)
     {
-        try
-        {
-            if (position < 0 || position >= _maxCount) throw new PositionOutOfCollectionException(position);
-            if (Count >= _maxCount) throw new CollectionOverflowException(Count);
+        if (position < 0 || position >= _maxCount)
+            throw new PositionOutOfCollectionException(position);
+        if (Count >= _maxCount) throw new CollectionOverflowException(Count);
 
-            if (obj == null) throw new ObjectNotFoundException(position);
+        if (obj == null)
+            throw new NullReferenceException("> Inserting object (at position) is null");
 
-            _collection.Insert(position, obj);
-            return position;
-        }
-        catch (CollectionOverflowException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return -1;
-        }
-        catch (ObjectNotFoundException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return -1;
-        }
-        catch (PositionOutOfCollectionException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return -1;
-        }
+        _collection.Insert(position, obj);
+        return position;
     }
 
     public T? Remove(int position)
     {
-        try {
-            if (position >= _maxCount || position < 0)
-            // on the other positions items don't exist
-            {
-                throw new CollectionOverflowException(position);
-            }
-
-            T? item = _collection[position];
-            _collection.RemoveAt(position);
-
-            if (item == null) throw new ObjectNotFoundException(position);
-
-            return item;
-        }
-        catch (CollectionOverflowException ex)
+        if (position >= _maxCount || position < 0)
+        // on the other positions items don't exist
         {
-            Console.WriteLine(ex.Message);
-            return null;
-        }
-        catch (ObjectNotFoundException ex)
-        {
-            Console.WriteLine(ex.Message);
-            return null;
+            throw new PositionOutOfCollectionException(position);
         }
+
+        T? item = _collection[position];
+        _collection.RemoveAt(position);
+
+        if (item == null) throw new ObjectNotFoundException(position);
+
+        return item;
     }
 
     public IEnumerable<T?> GetItems()
diff --git a/ProjectCruiser/CollectionGenericObj/ShipSharingService.cs b/ProjectCruiser/CollectionGenericObj/ShipSharingService.cs
index e430deb..1fa2de7 100644
--- a/ProjectCruiser/CollectionGenericObj/ShipSharingService.cs
+++ b/ProjectCruiser/CollectionGenericObj/ShipSharingService.cs
@@ -41,27 +41,33 @@ public class ShipSharingService : AbstractCompany
         }
     }
 
-    protected override void SetObjectsPosition()
+    protected override void SetObjectsPosition(int border)
     {
         int index_collection = 0;
-        int newX = fromBorder + 6, newY = fromCeiling + 6;
+        int newY = fromCeiling + 4;
 
         if (_collection != null)
         {
-            for (int i = 0; i < MaxInColon; ++i)
+            for (int i = 0; i < MaxInColon; i++)
             {
-                newX = fromBorder + 2;
-                for (int j = 0; j < MaxInRow; ++j)
+                int newX = fromBorder + 2;
+                for (int j = 0; j < MaxInRow; j++)
                 {
-                    if (_collection.GetItem(index_collection) != null)
+                    // TRY / CATCH [?]
+                    _collection.GetItem(index_collection).SetPictureSize(
+                        _pictureWidth, _pictureHeight);
+
+                    _collection.GetItem(index_collection).SetPosition(newX, newY);
+
+                    newX += _placeSizeWidth + between + 2;
+
+                    if (index_collection < border)
                     {
-                        _collection.GetItem(index_collection).SetPictureSize(_pictureWidth, _pictureHeight);
-                        _collection.GetItem(index_collection).SetPosition(newX, newY);
-                        newX += _placeSizeWidth + between + 2;
                         index_collection++;
                     }
+                    else return;
                 }
-                newY += _placeSizeHeight + 2;
+                newY += _placeSizeHeight + 1;
             }
         }
     }
diff --git a/ProjectCruiser/CollectionGenericObj/StorageCollection.cs b/ProjectCruiser/CollectionGenericObj/StorageCollection.cs
index a209124..acc8411 100644
--- a/ProjectCruiser/CollectionGenericObj/StorageCollection.cs
+++ b/ProjectCruiser/CollectionGenericObj/StorageCollection.cs
@@ -1,4 +1,5 @@
-using System.Text;
+using System.Security.Cryptography;
+using System.Text;
 using ProjectCruiser.DrawningSamples;
 using ProjectCruiser.Exceptions;
 
@@ -32,7 +33,7 @@ public class StorageCollection<T>
         if (name == null || _storages.ContainsKey(name)
             || collType == CollectionType.None)
         {
-            return;
+            throw new NullReferenceException("> Not enough information to save");
         }
 
         ICollectionGenObj<T> collection = CreateCollection(collType);
@@ -43,7 +44,7 @@ public class StorageCollection<T>
     public void DelCollection(string name)
     {
         if (_storages.ContainsKey(name)) _storages.Remove(name);
-        return;
+        else throw new NullReferenceException("> No such key in the list");
     }
 
     // Доступ к коллекции ( по ключу-строке - её имени ) - индексатор [!!!]
@@ -59,7 +60,7 @@ public class StorageCollection<T>
     public void SaveData(string filename)
     {
         if (_storages.Count == 0)
-            throw new NullReferenceException(" > No existing collections to save");
+            throw new NullReferenceException("> No existing collections to save");
 
         if (File.Exists(filename)) { File.Delete(filename); }
 
@@ -111,7 +112,7 @@ public class StorageCollection<T>
     // Загрузка информации по кораблям в хранилище из файла
     public void LoadData(string filename)
     {
-        if (!File.Exists(filename)) throw new FileNotFoundException();
+        if (!File.Exists(filename)) throw new FileNotFoundException("> No such file");
 
         string bufferTextFromFile = "";
 
@@ -145,14 +146,13 @@ public class StorageCollection<T>
             string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
             if (record.Length != 4) // >
                 // key | collType | maxcount | all next inf > 4
-            {
-                continue;
-            }
+            { continue; }
+
             CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
             ICollectionGenObj<T>? collection = StorageCollection<T>.CreateCollection(collectionType);
             
             if (collection == null)
-                throw new NullReferenceException("> Failed to create collection");
+                throw new NullReferenceException("[!] Failed to create collection");
 
             collection.MaxCount = Convert.ToInt32(record[2]);
             string[] set = record[3].Split(_separatorItems,
@@ -164,13 +164,15 @@ public class StorageCollection<T>
                 {
                     try
                     {
-                        if (collection.Insert(ship) == -1)
-                            throw new IndexOutOfRangeException(
-                                "> Failed to add to collection : " + record[3]);
+                        collection.Insert(ship);
+
+                        // throw new IndexOutOfRangeException IF IT WAS Insert(item, pos)
+                        // NullReferenceException >
+                        // CollectionOverflowException >
                     }
-                    catch (CollectionOverflowException e)
+                    catch (Exception e)
                     {
-                        throw new CollectionOverflowException("Collection overflowed", e);
+                        throw new Exception(e.Message);
                     }
                 }
             }
diff --git a/ProjectCruiser/Exceptions/CollectionOverflowException.cs b/ProjectCruiser/Exceptions/CollectionOverflowException.cs
index 43f991d..790d0a2 100644
--- a/ProjectCruiser/Exceptions/CollectionOverflowException.cs
+++ b/ProjectCruiser/Exceptions/CollectionOverflowException.cs
@@ -6,7 +6,7 @@ namespace ProjectCruiser.Exceptions;
 internal class CollectionOverflowException : ApplicationException
 {
     public CollectionOverflowException(int count)
-        : base("Possible accsess of collection is over : " + count) { }
+        : base("<> Possible accsess\nof collection is over : " + count) { }
     public CollectionOverflowException() : base() { }
     public CollectionOverflowException(string message) : base(message) { }
     public CollectionOverflowException(string message, Exception exception) :
diff --git a/ProjectCruiser/Exceptions/ObjectNotFoundException.cs b/ProjectCruiser/Exceptions/ObjectNotFoundException.cs
index 81e29f9..b6f8a4a 100644
--- a/ProjectCruiser/Exceptions/ObjectNotFoundException.cs
+++ b/ProjectCruiser/Exceptions/ObjectNotFoundException.cs
@@ -6,7 +6,7 @@ namespace ProjectCruiser.Exceptions;
 internal class ObjectNotFoundException : ApplicationException
 {
     public ObjectNotFoundException(int i)
-        : base("Didn't find obj on this position : " + i) { }
+        : base("<> Didn't find obj\non this position : " + i) { }
     public ObjectNotFoundException() : base() { }
     public ObjectNotFoundException(string message) : base(message) { }
     public ObjectNotFoundException(string message, Exception exception)
diff --git a/ProjectCruiser/Exceptions/PositionOutOfCollectionException.cs b/ProjectCruiser/Exceptions/PositionOutOfCollectionException.cs
index 266b7ee..305704e 100644
--- a/ProjectCruiser/Exceptions/PositionOutOfCollectionException.cs
+++ b/ProjectCruiser/Exceptions/PositionOutOfCollectionException.cs
@@ -6,7 +6,7 @@ namespace ProjectCruiser.Exceptions;
 internal class PositionOutOfCollectionException : ApplicationException
 {
     public PositionOutOfCollectionException(int i)
-        : base("Out of collection boarder. Position : " + i) { }
+        : base("<> Out of collection\nboarder. Position : " + i) { }
     public PositionOutOfCollectionException() : base() { }
     public PositionOutOfCollectionException(string message) : base(message) { }
     public PositionOutOfCollectionException(string message,
diff --git a/ProjectCruiser/Program.cs b/ProjectCruiser/Program.cs
index 7e7a369..9767135 100644
--- a/ProjectCruiser/Program.cs
+++ b/ProjectCruiser/Program.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
 using Serilog;
 
 namespace ProjectCruiser
@@ -16,26 +17,28 @@ namespace ProjectCruiser
             // see https://aka.ms/applicationconfiguration.
 
             ApplicationConfiguration.Initialize();
+
             ServiceCollection services = new();
             ConfigureServices(services);
-
             using ServiceProvider serviceProvider = services.BuildServiceProvider();
             Application.Run(serviceProvider.GetRequiredService<ServiceForm2>());
-        }
 
-        /// ������������ ������� DI
-        /// <param name="services"></param>
+        }
         private static void ConfigureServices(ServiceCollection services)
         {
+            string[] path = Directory.GetCurrentDirectory().Split('\\');
+            string pathNeed = "";
+            for (int i = 0; i < path.Length - 3; i++)
+            {
+                pathNeed += path[i] + "\\";
+            }
+
             services.AddSingleton<ServiceForm2>().AddLogging(option =>
             {
                 option.SetMinimumLevel(LogLevel.Information);
-                // [*] option.AddSerilog("serilog.config");
-                option.AddSerilog("serilog.config");
-
-                // instead of :
-                // option.SetMinimumLevel(LogLevel.Information);
-                // option.AddNLog("nlog.config");
+                option.AddSerilog(new LoggerConfiguration().ReadFrom.Configuration(
+                    new ConfigurationBuilder().AddJsonFile(
+                        $"{pathNeed}serilog.json").Build()).CreateLogger());
             });
         }
     }
diff --git a/ProjectCruiser/ProjectCruiser.csproj b/ProjectCruiser/ProjectCruiser.csproj
index 1afe9e3..3d70e47 100644
--- a/ProjectCruiser/ProjectCruiser.csproj
+++ b/ProjectCruiser/ProjectCruiser.csproj
@@ -9,13 +9,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Serilog" Version="4.0.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="serilog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/ProjectCruiser/ServiceForm2.Designer.cs b/ProjectCruiser/ServiceForm2.Designer.cs
index d065feb..dc4fd35 100644
--- a/ProjectCruiser/ServiceForm2.Designer.cs
+++ b/ProjectCruiser/ServiceForm2.Designer.cs
@@ -221,7 +221,7 @@
             btnDelete.TabIndex = 4;
             btnDelete.Text = "Delete";
             btnDelete.UseVisualStyleBackColor = true;
-            btnDelete.Click += btnRemoveCar_Click;
+            btnDelete.Click += btnRemoveShip_Click;
             // 
             // btnAddCruiser
             // 
diff --git a/ProjectCruiser/ServiceForm2.cs b/ProjectCruiser/ServiceForm2.cs
index 83edf3e..dfeae24 100644
--- a/ProjectCruiser/ServiceForm2.cs
+++ b/ProjectCruiser/ServiceForm2.cs
@@ -1,7 +1,7 @@
 using ProjectCruiser.CollectionGenericObj;
 using ProjectCruiser.DrawningSamples;
-
 using Microsoft.Extensions.Logging;
+using ProjectCruiser.Exceptions;
 // using NLog.Extensions.Logging;
 
 namespace ProjectCruiser;
@@ -22,7 +22,7 @@ public partial class ServiceForm2 : Form
         InitializeComponent();
         _storageCollection = new();
         _logger = logger;
-    
+        _logger.LogInformation("> Form is loaded successfully");
     }
 
     // Выбор компании
@@ -31,13 +31,10 @@ public partial class ServiceForm2 : Form
         toolPanel.Enabled = false;
     }
 
-    // Color picker (default : random) <...>
-
     // Добавление корабля
     private void btnAddTransport_Click(object sender, EventArgs e)
     {
         EditorForm3 form3 = new();
-        // TODO передать метод :
         form3.AddEvent(CreateObject);
         form3.Show();
     }
@@ -45,43 +42,58 @@ public partial class ServiceForm2 : Form
     // Создание объекта класса-перемещения
     private void CreateObject(DrawningBase? ship)
     {
-        if (_company == null || ship == null)
-        {
-            return;
-        }
-        if (_company + ship != -1)
+        try
         {
+            if (_company == null || ship == null)
+            {
+                throw new NullReferenceException(" > No existing collections to save");
+            }
+
+            int count = _company + ship;
+
             MessageBox.Show("> Object was added");
             pictureBox.Image = _company.Show();
+
+            _logger.LogInformation("> Adding object succeed {ship} at {count} position", ship, count);
         }
-        else
+        catch (Exception ex)
         {
-            MessageBox.Show("[!] Failed to add object");
+            MessageBox.Show("[!] Failed to add object\n" + ex.Message);
+            _logger.LogError("< Error > : {Message}", ex.Message);
         }
     }
 
     // Удаление объекта
-    private void btnRemoveCar_Click(object sender, EventArgs e)
+    private void btnRemoveShip_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrEmpty(maskedTextBoxPosition.Text)
             || _company == null) return;
 
         if (MessageBox.Show("[*] Remove object: Are you sure?", "Remove",
         MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
+
         int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
 
-        if (_company - Convert.ToInt32(maskedTextBoxPosition.Text) != null)
+        try
         {
-            MessageBox.Show("> Object was removed");
-            pictureBox.Image = _company.Show();
+            if (_company - pos != null)
+            {
+                MessageBox.Show("> Object was removed");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Object at " +
+                    pos + "position was deleted successfully");
+            }
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show("[!] Failed to remove object");
+            _logger.LogError("< Error > : {Message}", ex.Message);
         }
-        else MessageBox.Show("[!] Failed to remove object");
     }
 
     // Передача объекта в другую форму
     private void btnChooseforTest_Click(object sender, EventArgs e)
     {
-        // Add EXCEPTIONS [!]
         if (_company == null)
         {
             return;
@@ -117,7 +129,6 @@ public partial class ServiceForm2 : Form
         form.ShowDialog();
     }
 
-    // Перерисовка коллекции
     private void btnRefresh_Click(object sender, EventArgs e)
     {
         if (_company == null)
@@ -146,7 +157,17 @@ public partial class ServiceForm2 : Form
             collType = CollectionType.List;
         }
 
-        _storageCollection.AddCollection(maskedTxtBoxCName.Text, collType);
+        try
+        {
+            _storageCollection.AddCollection(maskedTxtBoxCName.Text, collType);
+            _logger.LogInformation("Adding collection succeed : {Name}, {Type}", maskedTxtBoxCName.Text, collType);
+        }
+        catch (NullReferenceException ex)
+        {
+            Console.WriteLine(ex.Message);
+            _logger.LogError("< Error > : {Message}", ex.Message);
+        }
+
         RefreshListBoxItems();
     }
 
@@ -156,13 +177,21 @@ public partial class ServiceForm2 : Form
         {
             MessageBox.Show("Collection was not choosed");
             return;
-        }
-        if (MessageBox.Show("Are you sure?", "Removing", MessageBoxButtons.OK, MessageBoxIcon.Question) != DialogResult.OK)
+        } if (MessageBox.Show("Are you sure?", "Removing",
+            MessageBoxButtons.OK, MessageBoxIcon.Question)
+            != DialogResult.OK) return;
+
+        try
         {
-            return;
+            _storageCollection.DelCollection(listBox.SelectedItem.ToString());
+            RefreshListBoxItems();
+            _logger.LogInformation("Removing collection succeed : {Name}", listBox.SelectedItem.ToString);
+        }
+        catch (NullReferenceException ex)
+        {
+            Console.WriteLine(ex.Message);
+            _logger.LogError("< Error > : {Message}", ex.Message);
         }
-        _storageCollection.DelCollection(listBox.SelectedItem.ToString());
-        RefreshListBoxItems();
     }
 
     private void RefreshListBoxItems()
@@ -199,7 +228,7 @@ public partial class ServiceForm2 : Form
         {
             case "Storage":
                 _company = new ShipSharingService(pictureBox.Width,
-                pictureBox.Height, collection);
+                    pictureBox.Height, collection);
                 break;
         }
 
@@ -235,9 +264,16 @@ public partial class ServiceForm2 : Form
             try
             {
                 _storageCollection.LoadData(openFileDialog.FileName);
+                // LoadData() : Exceptions
+                // FileNotFoundException
+                // NullReferenceException
+                // InvalidDataException
+                // IndexOutOfRangeException
+                // CollectionOverflowException
+
                 MessageBox.Show(" < Loaded succesfully >",
                 "Result :", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                _logger.LogInformation("Loading from file : {filename}", openFileDialog.FileName);
+                _logger.LogInformation("Loading from file : {Filename}", openFileDialog.FileName);
 
                 RefreshListBoxItems();
             }
diff --git a/ProjectCruiser/serilog.config b/ProjectCruiser/serilog.config
deleted file mode 100644
index a00fcc6..0000000
--- a/ProjectCruiser/serilog.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<serilog xmlns="http://www.serilog-project.org/schemas/Serilog.xsd"
-	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 autoReload="true" internalLogLevel="Info">
-		<targets>
-			<target xsi:type="File" name="tofile" fileName="shiplog-${shortdate}.log"/>
-		</targets>
-		<rules>
-			<logger name="*" minlevel="Debug" writeTo="tofile"/>
-		</rules>
-	</serilog>
-</configuration>
diff --git a/ProjectCruiser/serilog.json b/ProjectCruiser/serilog.json
new file mode 100644
index 0000000..fd4d7d8
--- /dev/null
+++ b/ProjectCruiser/serilog.json
@@ -0,0 +1,15 @@
+{
+    "Serilog": {
+        "Using": [ "Serilog.Sinks.File" ],
+        "MinimumLevel": "Debug",
+        "WriteTo": [
+            {
+                "Name": "File",
+                "Args": { "path": "log.log" }
+            }
+        ],
+        "Properties": {
+            "Application": "Sample"
+        }
+    }
+}