2.0 meta

Continue decoupling code from Nodes