EHO-206 project assignment refactor