Started adding shutdown procedures