Add logging framework
Merge addition of logging