Started adding nodes, renamed a lot of stuff, we're about 20% of the way there!