Finished adding owner
Merge branch 'add_node_owner' into dev