Added Safe/Unsafe modes.  Preliminary rollback support.