Reimplementing features to work with new tokenized html.