public marks

PUBLIC MARKS from jasonbentley with tags server & hacks