Add logging (too verbose for now)
Merge branch 'f/add-logging' into develop