[TASK] Temporary Presentation Refactor