move org conditions material into own class
factor out glue function