WIP - Adding ES, edit, mark as reviewed, etc.