Starting to get rid of the old Node structure.