Start moving to a slightly more robust shutdown process