saving state before major restructuring
fiddling in progress