public marks

PUBLIC MARKS from sbrothier with tags & identity