WIP: Promote Review Tool refactor