Clean up
Add "On Hold" state