Meh, some refactoring necessary in order to get the path finding integrated...