Working on logging
Merge
Merge already