Started work on node manager
Merge fix