public marks

PUBLIC MARKS from bacon with tags dev & template