Adding shutdown manager .. work in progress