Move common node stuff up to Node class