Initial restructuring, untested.