working on node class
merge conflicts fixed (didnt need to change anything)
made node headers