pending/cancelled view
testing
Reviewed retire_logic feature
fixed merge conflicts
fixed conflicts