add logging
Merge branch 'logging' into staging