Moved vector navigation methods into shapes