Added the node stuff, and improved the setup