Feature/node refactor

Maybe this should be part of the builder?