Fixes after the merge
Trying to get the paths functional
Pointer?