Went too far with over-engineering. Going to working copy first.