Improve Stalker to allow graceful shutdown
Update to the new Stalker API to allow graceful shutdown