WIP Nodes
ADD tests
formatting