Adapting to push/pull node.py, not quite there yet.