*8212* Review / decision refactor continued