wip
Add Logging