Implement Navigator
fix test