Offboard2 merge

This is my offboard branch on top of the navigator_rewrite and the offboard2 branch.