more work in redesign - good progress but mainly untested