- More or less follows the new naming convetions
- New implementation for dijkstra();