Improved logging with Markers in a couple of classes.
initial commit