Fedora nodes refactor

https://www.pivotaltracker.com/story/show/79487204
If that's possible, that would be awesome.