first draft federation support
updated federation