import current state

The migration to the new configuration system, halfway there.