Add log marks (not finished yet - partial commit)