Working on graceful stop...