Major API break -- added triggers, images, removed html clean