MS-380: first pass at making content semantic