Working on federator
Lots of simplifications in federator implementation