federation iteration 2
Merge pull request #559 from patriot1burke/master

federation iteration 2