Navigation Module development (part 2.3)