Finally give Node some love

Maybe not perfect, but it's a start.