Initial work for logging
Finished moving to a pro logging system