Fedora nodes refactor

https://www.pivotaltracker.com/story/show/79487204
I wrote this, so it's my fault. Sometime in the next few days, I'll write the test. Ticket, please?