Moved auv_control to new branch