Add logging (2/18)

Add logging