logger almost done
merge