major rework, beginning recovery updates