move addresses fixtures into an include
implement "reversible" scheme