Refactor for manipulators
Refactor for inter-manipulator access, manips now keep reference to parent