Add TODO for Status Handling