Update on the CaseOh model (Still WIP)