Shifted some stuff around, started getting ready to implement cache backups.