WIP. graceful stop is not complete yet...