[TASK] Commit recent work