#510 This seems like the minimum change needed for the resilience proposal

I'm not sure if this is the best place to put these changes, but I thought I'd throw this up as a starting point.