WIP on risk analysis partial logic