Tidy up command fall through cases
Remember to queue users as we shutdown