Work in progress - Logging and Refactoring