log working, not everything added
Merge branch 'ld_log'