Better backups

(Without notifications yet)