in theory cinder added, needs some testing and tweaking...