work on backup and restore functions

refactored components to use new functions