merge issue with reactions - major model edit. Will add back as required