Work on incorporating hybrid reinfection
Changes to OCL preference handling and sampling logic to prepare
full conditionals for the more general 'model' framework