Put federation into a layer.

I think this is possibly the key to making future development far easier. I only wish I could help.