Refactored backups to work again