Nodev2

Rebasing NodeV2 onto Controller.  Hopefully nothing bad will happen!