Path

TODO: starting the PR - but will comment on it what's here later :)