Add initial logging changes
Finish up logging coding portion