Logging

don't check in commented code unless it's work-in-progress