Redis based shutdown

Up merging / adding tests