early work on adding mentions