basic logs
Merge branch 'logs'