E217/E16-A - Logging

Merged Logging module. Unit tests carried out successfully.