Many refactorizations. Path functionality.