Finished implementing logging