About halfway through reorganizing. Lots of changes.