public marks

PUBLIC MARKS from nhoizey with tags rest & todo:slides