merge
merging
remade TAO into a Node class, still need bilinear