Add shutdown
Move things around