moving to node setters for persisting data
renamed
fixing up merge conflicts