Refactor api intake actions and progress calculations