WIP Add shutdown property