Refactor nodes, still more to do but working